From ffb8528465787f5122b07a34b4a77f083aea10b1 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Thu, 15 Feb 2018 15:53:07 -0500 Subject: [PATCH] move vpnservice and cleanup poms Change-Id: I16824568c0e89e33abc299d16e8d397c2cd95a90 Signed-off-by: Sam Hague --- aclservice/api/pom.xml | 51 ++++ .../aclservice/api/AclInterfaceCache.java | 0 .../aclservice/api/AclServiceListener.java | 0 .../aclservice/api/AclServiceManager.java | 0 .../aclservice/api/utils/AclDataCache.java | 0 .../aclservice/api/utils/AclInterface.java | 0 .../aclservice/api/utils/IAclServiceUtil.java | 0 .../rev160608/IpPrefixOrAddressBuilder.java | 0 .../src/main/yang/acl-live-statistics.yang | 0 .../api/src/main/yang/aclservice.yang | 0 aclservice/impl/pom.xml | 194 ++++++++++++++ .../aclservice/AbstractAclServiceImpl.java | 0 .../aclservice/AclInterfaceCacheImpl.java | 0 .../aclservice/AclServiceImplFactory.java | 0 .../aclservice/AclServiceManagerImpl.java | 1 + .../aclservice/EgressAclServiceImpl.java | 0 .../aclservice/IngressAclServiceImpl.java | 0 .../listeners/AclElanInterfaceListener.java | 0 .../listeners/AclEventListener.java | 0 .../listeners/AclInterfaceListener.java | 0 .../listeners/AclInterfaceStateListener.java | 0 .../aclservice/listeners/AclNodeListener.java | 0 .../stats/AclLiveStatisticsHelper.java | 0 .../AclLiveStatisticsRpcServiceImpl.java | 0 .../aclservice/utils/AclClusterUtil.java | 0 .../aclservice/utils/AclClusterUtilImpl.java | 0 .../utils/AclConntrackClassifierType.java | 0 .../aclservice/utils/AclConstants.java | 0 .../netvirt/aclservice/utils/AclDataUtil.java | 0 .../utils/AclNodeDefaultFlowsTxBuilder.java | 0 .../utils/AclServiceOFFlowBuilder.java | 0 .../utils/AclServiceUtilFacade.java | 0 .../aclservice/utils/AclServiceUtils.java | 0 .../initial/netvirt-aclservice-config.xml | 0 .../org/opendaylight/blueprint/aclservice.xml | 0 .../impl/src/main/yang/aclservice-config.yang | 0 .../AclLiveStatisticsRpcServiceTest.java | 0 .../stats/TestOdlDirectStatisticsService.java | 0 .../aclservice/tests/AclServiceModule.java | 0 .../tests/AclServiceStatefulIPv6Test.java | 0 .../tests/AclServiceStatefulTest.java | 0 .../aclservice/tests/AclServiceTestBase.java | 0 .../tests/AclServiceTestBaseIPv6.java | 0 .../tests/AclServiceTestModule.java | 0 .../tests/FlowEntryObjectsBase.xtend | 0 .../tests/FlowEntryObjectsStateful.xtend | 0 .../tests/FlowEntryObjectsStatefulIPv6.xtend | 0 .../netvirt/aclservice/tests/IdHelper.java | 0 .../tests/IdentifiedAceBuilder.xtend | 0 .../IdentifiedInterfaceWithAclBuilder.xtend | 0 .../IdentifiedSubnetIpPrefixBuilder.xtend | 0 .../tests/StateInterfaceBuilderHelper.xtend | 0 .../tests/infra/DataBrokerPairsUtil.java | 0 ...taTreeIdentifierDataObjectPairBuilder.java | 0 .../aclservice/tests/infra/package-info.java | 0 .../aclservice/utils/AclDataUtilTest.java | 0 .../utils/AclServiceOFFlowBuilderTest.java | 0 .../aclservice/utils/AclServiceTestUtils.java | 0 .../utils/MethodInvocationParamSaver.java | 0 .../test/resources/simplelogger.properties | 0 aclservice/pom.xml | 51 ++++ aclservice/shell/pom.xml | 46 ++++ .../shell/DisplayAclDataCaches.java | 3 - .../org/opendaylight/blueprint/blueprint.xml | 0 {vpnservice/alarm => alarm}/impl/pom.xml | 0 .../netvirt/alarm/NeutronvpnAlarms.java | 0 .../netvirt/alarm/NvpnJMXAlarmAgent.java | 0 .../alarm/NvpnNbrControlPathAlarm.java | 0 .../alarm/NvpnNbrControlPathAlarmMBean.java | 0 .../test/ExtraRouteConfigFaultAlarmTest.java | 0 .../alarm/test/NeutronvpnAlarmsTest.java | 0 {vpnservice/alarm => alarm}/pom.xml | 12 +- .../bgpmanager-api/pom.xml | 8 +- .../netvirt/bgpmanager/api/IBgpManager.java | 0 bgpmanager/bgpmanager-impl/pom.xml | 138 ++++++++++ .../bgpmanager/BgpConfigurationManager.java | 0 .../netvirt/bgpmanager/BgpManager.java | 0 .../netvirt/bgpmanager/BgpUtil.java | 0 .../netvirt/bgpmanager/ConfigureBgpCli.java | 0 .../bgpmanager/DisplayBgpConfigCli.java | 0 .../bgpmanager/EvpnRdNetworkListener.java | 0 .../netvirt/bgpmanager/FibDSWriter.java | 0 .../netvirt/bgpmanager/RetryOnException.java | 0 .../netvirt/bgpmanager/VtyshCli.java | 0 .../netvirt/bgpmanager/commands/Cache.java | 0 .../bgpmanager/commands/ClearBgpCli.java | 0 .../netvirt/bgpmanager/commands/Commands.java | 0 .../netvirt/bgpmanager/commands/Connect.java | 0 .../netvirt/bgpmanager/commands/Misc.java | 0 .../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 .../bgpmanager/oam/BgpAlarmBroadcaster.java | 0 .../oam/BgpAlarmBroadcasterMBean.java | 0 .../bgpmanager/oam/BgpAlarmErrorCodes.java | 0 .../bgpmanager/oam/BgpAlarmStatus.java | 0 .../netvirt/bgpmanager/oam/BgpAlarms.java | 0 .../netvirt/bgpmanager/oam/BgpConstants.java | 0 .../netvirt/bgpmanager/oam/BgpCounters.java | 0 .../bgpmanager/oam/BgpJMXAlarmAgent.java | 0 .../oam/BgpNbrControlPathAlarm.java | 0 .../oam/BgpNbrControlPathAlarmMBean.java | 0 .../bgpmanager/thrift/client/BgpRouter.java | 0 .../thrift/client/BgpRouterException.java | 0 .../thrift/client/BgpSyncHandle.java | 0 .../thrift/gen/BgpConfigurator.java | 0 .../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 .../bgpmanager/thrift/gen/af_safi.java | 0 .../bgpmanager/thrift/gen/encap_type.java | 0 .../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 .../thrift/server/BgpThriftService.java | 0 .../org/opendaylight/blueprint/bgpmanager.xml | 0 .../org/opendaylight/blueprint/commands.xml | 0 .../test/AbstractMockFibManager.java | 0 .../bgpmanager/test/BgpManagerTest.java | 0 .../bgpmanager/test/MockFibManager.java | 0 .../client/BgpRouterAddNeighborTest.java | 0 bgpmanager/pom.xml | 50 ++++ cache/impl/pom.xml | 46 ++++ .../cache/impl/l2gw/L2GatewayCacheImpl.java | 0 .../org/opendaylight/blueprint/cache-impl.xml | 0 cache/pom.xml | 49 ++++ .../cloud-servicechain-api/pom.xml | 35 +++ .../api/ICloudServiceChain.java | 0 .../main/yang/cloud-servicechain-state.yang | 0 .../cloud-servicechain-impl/pom.xml | 96 +++++++ .../CloudServiceChainConstants.java | 0 .../CloudServiceChainProvider.java | 0 .../ElanServiceChainHandler.java | 0 .../VPNServiceChainHandler.java | 0 .../jobs/AddVpnPseudoPortDataJob.java | 0 .../jobs/RemoveVpnPseudoPortDataJob.java | 0 .../jobs/VpnPseudoPortDataBaseJob.java | 0 .../CloudScVpnInterfaceListener.java | 0 .../listeners/ElanDpnInterfacesListener.java | 0 .../listeners/VpnPseudoPortListener.java | 0 .../listeners/VpnToDpnListener.java | 0 .../VpnToElanFallbackNodeListener.java | 0 .../listeners/VrfListener.java | 0 .../utils/ElanServiceChainUtils.java | 0 .../utils/VpnPseudoPortCache.java | 0 .../utils/VpnServiceChainUtils.java | 0 .../blueprint/cloud-servicechain.xml | 0 .../VPNServiceChainHandlerTest.java | 0 .../matchers/FlowEntityMatcher.java | 0 .../matchers/FlowMatcher.java | 0 .../matchers/NodeIIdMatcher.java | 0 .../test/resources/simplelogger.properties | 0 cloud-servicechain/pom.xml | 49 ++++ coe/api/pom.xml | 34 +++ coe/impl/pom.xml | 80 ++++++ .../netvirt/coe/listeners/PodListener.java | 0 .../coe/listeners/ServiceListener.java | 0 .../netvirt/coe/utils/CoeUtils.java | 0 .../opendaylight/blueprint/coe-renderer.xml | 0 coe/pom.xml | 50 ++++ .../binding-parent/pom.xml | 0 commons/pom.xml | 49 ++++ dhcpservice/dhcpservice-api/pom.xml | 39 +++ .../netvirt/dhcpservice/api/DHCP.java | 0 .../dhcpservice/api/DHCPConstants.java | 0 .../netvirt/dhcpservice/api/DHCPOptions.java | 0 .../netvirt/dhcpservice/api/DHCPUtils.java | 0 .../dhcpservice/api/DhcpMConstants.java | 0 .../dhcpservice-api/src/main/yang/dhcp.yang | 0 .../src/main/yang/dhcp_allocation_pool.yang | 0 .../src/main/yang/dhcpservice-api.yang | 0 dhcpservice/dhcpservice-impl/pom.xml | 147 ++++++++++ .../DhcpAllocationPoolListener.java | 0 .../DhcpAllocationPoolManager.java | 0 .../dhcpservice/DhcpConfigListener.java | 0 .../DhcpDesignatedDpnListener.java | 0 .../DhcpExternalTunnelManager.java | 0 .../netvirt/dhcpservice/DhcpInfo.java | 0 .../DhcpInterfaceConfigListener.java | 0 .../DhcpInterfaceEventListener.java | 0 .../netvirt/dhcpservice/DhcpL2GwUtil.java | 0 .../netvirt/dhcpservice/DhcpManager.java | 0 .../dhcpservice/DhcpMcastMacListener.java | 0 .../dhcpservice/DhcpNeutronPortListener.java | 0 .../netvirt/dhcpservice/DhcpPktHandler.java | 0 .../netvirt/dhcpservice/DhcpPortCache.java | 0 .../dhcpservice/DhcpServiceCounters.java | 0 .../netvirt/dhcpservice/DhcpServiceUtils.java | 0 .../dhcpservice/DhcpSubnetListener.java | 0 .../dhcpservice/DhcpUCastMacListener.java | 0 .../netvirt/dhcpservice/NodeListener.java | 0 .../jobs/DhcpAllocationPoolAddJob.java | 0 .../jobs/DhcpAllocationPoolRemoveJob.java | 0 .../dhcpservice/jobs/DhcpInterfaceAddJob.java | 0 .../jobs/DhcpInterfaceRemoveJob.java | 0 .../jobs/DhcpInterfaceUpdateJob.java | 0 .../initial/netvirt-dhcpservice-config.xml | 0 .../opendaylight/blueprint/dhcpservice.xml | 0 .../src/main/yang/dhcpservice-config.yang | 0 dhcpservice/pom.xml | 49 ++++ elanmanager/elanmanager-api/pom.xml | 60 +++++ .../arp/responder/ArpResponderConstant.java | 0 .../elan/arp/responder/ArpResponderInput.java | 0 .../elan/arp/responder/ArpResponderUtil.java | 0 .../netvirt/elanmanager/api/ElanHelper.java | 0 .../elanmanager/api/IElanBridgeManager.java | 0 .../netvirt/elanmanager/api/IElanService.java | 0 .../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 .../elanmanager-api/src/main/yang/elan.yang | 0 .../elanmanager-api/src/main/yang/etree.yang | 0 .../src/main/yang/scalein-rpc.yang | 0 elanmanager/elanmanager-impl/pom.xml | 250 ++++++++++++++++++ .../netvirt/elan/ElanException.java | 0 .../netvirt/elan/cli/ElanAdd.java | 0 .../netvirt/elan/cli/ElanDelete.java | 0 .../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 .../netvirt/elan/cli/ElanUpdate.java | 0 .../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 .../elan/cli/etree/EtreeInterfaceAdd.java | 0 .../elan/cli/etree/EtreeInterfaceDelete.java | 0 .../elan/cli/etree/EtreeInterfaceGet.java | 0 .../elan/cli/l2gw/L2GwUtilsCacheCli.java | 0 .../elan/cli/l2gw/L2GwValidateCli.java | 0 .../cli/l2gw/NetworkL2gwDeviceInfoCli.java | 0 .../diagstatus/ElanDiagStatusProvider.java | 0 .../evpn/listeners/ElanMacEntryListener.java | 0 .../listeners/EvpnElanInstanceListener.java | 0 .../evpn/listeners/MacVrfEntryListener.java | 0 .../elan/evpn/utils/ElanEvpnFlowUtils.java | 0 .../elan/evpn/utils/EvpnMacVrfUtils.java | 0 .../netvirt/elan/evpn/utils/EvpnUtils.java | 0 .../elan/internal/ElanBridgeManager.java | 0 .../ElanDpnInterfaceClusteredListener.java | 0 .../internal/ElanDpnInterfacesListener.java | 0 .../ElanDpnToTransportZoneListener.java | 0 .../elan/internal/ElanExtnTepListener.java | 0 .../elan/internal/ElanInstanceManager.java | 0 .../internal/ElanInterfaceConfigListener.java | 0 .../elan/internal/ElanInterfaceManager.java | 0 .../ElanInterfaceStateChangeListener.java | 0 .../ElanInterfaceStateClusteredListener.java | 0 .../elan/internal/ElanItmEventListener.java | 0 .../ElanLearntVpnVipToPortListener.java | 0 .../elan/internal/ElanManagerCounters.java | 0 .../elan/internal/ElanNodeListener.java | 0 .../elan/internal/ElanOvsdbNodeListener.java | 0 .../elan/internal/ElanPacketInHandler.java | 0 .../elan/internal/ElanServiceProvider.java | 0 .../internal/ElanSmacFlowEventListener.java | 0 .../ElanTunnelInterfaceStateListener.java | 0 .../internal/InterfaceAddWorkerOnElan.java | 0 .../InterfaceAddWorkerOnElanInterface.java | 0 .../internal/InterfaceRemoveWorkerOnElan.java | 0 .../InterfaceRemoveWorkerOnElanInterface.java | 0 .../VpnDpnToTransportZoneListener.java | 0 .../elan/l2gw/ha/BatchedTransaction.java | 0 .../netvirt/elan/l2gw/ha/HwvtepHAUtil.java | 0 .../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 .../l2gw/ha/commands/LogicalSwitchesCmd.java | 0 .../elan/l2gw/ha/commands/MergeCommand.java | 0 .../l2gw/ha/commands/PhysicalLocatorCmd.java | 0 .../elan/l2gw/ha/commands/RemoteMcastCmd.java | 0 .../elan/l2gw/ha/commands/RemoteUcastCmd.java | 0 .../elan/l2gw/ha/commands/SwitchesCmd.java | 0 .../l2gw/ha/commands/TerminationPointCmd.java | 0 .../elan/l2gw/ha/commands/TunnelCmd.java | 0 .../elan/l2gw/ha/commands/TunnelIpCmd.java | 0 .../ha/handlers/ConfigNodeUpdatedHandler.java | 0 .../elan/l2gw/ha/handlers/HAEventHandler.java | 0 .../l2gw/ha/handlers/IHAEventHandler.java | 0 .../elan/l2gw/ha/handlers/INodeCopier.java | 0 .../ha/handlers/NodeConnectedHandler.java | 0 .../elan/l2gw/ha/handlers/NodeCopier.java | 0 .../ha/handlers/NodeDisconnectedHandler.java | 0 .../ha/handlers/OpNodeUpdatedHandler.java | 0 .../ha/listeners/HAConfigNodeListener.java | 0 .../l2gw/ha/listeners/HAJobScheduler.java | 0 .../elan/l2gw/ha/listeners/HAListeners.java | 0 .../ha/listeners/HAOpClusteredListener.java | 0 .../l2gw/ha/listeners/HAOpNodeListener.java | 0 .../ha/listeners/HwvtepNodeBaseListener.java | 0 .../ha/listeners/HwvtepNodeDataListener.java | 0 .../ha/merge/GlobalAugmentationMerger.java | 0 .../elan/l2gw/ha/merge/GlobalNodeMerger.java | 0 .../ha/merge/MergeCommandsAggregator.java | 0 .../l2gw/ha/merge/PSAugmentationMerger.java | 0 .../elan/l2gw/ha/merge/PSNodeMerger.java | 0 .../l2gw/jobs/AssociateHwvtepToElanJob.java | 0 .../jobs/DeleteL2GwDeviceMacsFromElanJob.java | 0 .../l2gw/jobs/DeleteLogicalSwitchJob.java | 0 .../jobs/DisAssociateHwvtepFromElanJob.java | 0 .../jobs/HwvtepDeviceMcastMacUpdateJob.java | 0 .../elan/l2gw/jobs/LogicalSwitchAddedJob.java | 0 .../elan/l2gw/listeners/ChildListener.java | 0 .../l2gw/listeners/ElanGroupListener.java | 0 .../l2gw/listeners/ElanInstanceListener.java | 0 .../HwvtepLocalUcastMacListener.java | 0 .../HwvtepLogicalSwitchListener.java | 0 .../HwvtepPhysicalSwitchListener.java | 0 .../HwvtepRemoteMcastMacListener.java | 0 .../HwvtepTerminationPointListener.java | 0 .../L2GatewayConnectionListener.java | 0 .../l2gw/listeners/LocalUcastMacListener.java | 0 .../utils/ElanL2GatewayMulticastUtils.java | 0 .../elan/l2gw/utils/ElanL2GatewayUtils.java | 0 .../l2gw/utils/L2GatewayConnectionUtils.java | 0 .../elan/l2gw/utils/L2GatewayUtils.java | 0 .../elan/l2gw/utils/L2gwServiceProvider.java | 0 .../l2gw/utils/SettableFutureCallback.java | 0 .../l2gw/utils/StaleVlanBindingsCleaner.java | 0 .../elan/statisitcs/ElanStatisticsImpl.java | 0 .../elan/utils/CacheElanInstanceListener.java | 0 .../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 .../utils/ElanForwardingEntriesHandler.java | 0 .../netvirt/elan/utils/ElanItmUtils.java | 0 .../netvirt/elan/utils/ElanUtils.java | 0 .../netvirt/elan/utils/Scheduler.java | 0 .../utils/TransportZoneNotificationUtil.java | 0 .../initial/netvirt-elanmanager-config.xml | 0 .../org/opendaylight/blueprint/commands.xml | 0 .../opendaylight/blueprint/elanmanager.xml | 0 .../src/main/yang/elanmanager-config.yang | 0 .../elan/l2gw/LogicalSwitchesCmdTest.java | 0 .../l2gw/nodehandlertest/DataProvider.java | 0 .../GlobalAugmentationHelper.java | 0 .../NodeConnectedHandlerTest.java | 0 .../NodeConnectedHandlerUtils.java | 0 .../nodehandlertest/PhysicalSwitchHelper.java | 0 .../l2gw/nodehandlertest/TestBuilders.java | 0 .../l2gw/nodehandlertest/TestComparators.java | 0 .../elan/l2gw/nodehandlertest/TestUtil.java | 0 .../elanmanager/tests/ElanServiceTest.java | 0 .../tests/ElanServiceTestBase.java | 0 .../tests/ElanServiceTestModule.java | 0 .../elanmanager/tests/ExpectedObjects.xtend | 0 .../tests/utils/BgpManagerTestImpl.java | 0 .../tests/utils/ElanEgressActionsHelper.java | 0 .../tests/utils/EvpnTestHelper.java | 0 .../elanmanager/tests/utils/IdHelper.java | 0 .../tests/utils/InterfaceHelper.java | 0 .../tests/utils/VpnManagerTestImpl.java | 0 .../tests/.ExpectedObjects.java._trace | Bin 0 -> 4071 bytes .../elanmanager/tests/ExpectedObjects.java | 136 ++++++++++ elanmanager/pom.xml | 50 ++++ .../netvirt-features/pom.xml | 12 +- .../netvirt-sfc-features/pom.xml | 5 +- .../odl-netvirt-api/pom.xml | 78 +++--- .../odl-netvirt-coe/pom.xml | 7 +- .../odl-netvirt-impl/pom.xml | 101 ++++--- .../src/main/feature/feature.xml | 0 .../odl-netvirt-openstack/pom.xml | 20 +- .../odl-netvirt-sfc/pom.xml | 20 +- .../odl-netvirt-ui/pom.xml | 8 +- {vpnservice/features => features}/pom.xml | 11 +- fibmanager/fibmanager-api/pom.xml | 64 +++++ .../netvirt/fibmanager/api/FibHelper.java | 0 .../netvirt/fibmanager/api/IFibManager.java | 0 .../fibmanager/api/L3VPNTransportTypes.java | 0 .../netvirt/fibmanager/api/RouteOrigin.java | 0 .../fibmanager-api/src/main/yang/fib-rpc.yang | 0 .../src/main/yang/l3nexthop.yang | 0 .../fibmanager-api/src/main/yang/odl-fib.yang | 0 fibmanager/fibmanager-impl/pom.xml | 92 +++++++ .../fibmanager/BaseVrfEntryHandler.java | 0 .../fibmanager/BgpRouteVrfEntryHandler.java | 0 .../fibmanager/EvpnVrfEntryHandler.java | 0 .../netvirt/fibmanager/FibConstants.java | 0 .../netvirt/fibmanager/FibManagerImpl.java | 0 .../netvirt/fibmanager/FibRpcServiceImpl.java | 0 .../netvirt/fibmanager/FibUtil.java | 0 .../netvirt/fibmanager/IPv6Handler.java | 0 .../netvirt/fibmanager/IVrfEntryHandler.java | 0 .../netvirt/fibmanager/NexthopManager.java | 0 .../RouterInterfaceVrfEntryHandler.java | 0 .../netvirt/fibmanager/VrfEntryListener.java | 0 .../org/opendaylight/blueprint/fibmanager.xml | 0 .../fibmanager/test/FibManagerTest.java | 0 fibmanager/fibmanager-shell/pom.xml | 41 +++ .../shell/ConfTransportL3VPNCommand.java | 0 .../fibmanager/shell/ShowFibCommand.java | 0 .../shell/ShowTransportTypeCommand.java | 0 .../org/opendaylight/blueprint/blueprint.xml | 0 fibmanager/pom.xml | 50 ++++ ipv6service/api/pom.xml | 38 +++ .../netvirt/ipv6service/api/ElementCache.java | 0 .../ipv6service/api/IVirtualNetwork.java | 0 .../netvirt/ipv6service/api/IVirtualPort.java | 0 .../ipv6service/api/IVirtualRouter.java | 0 .../ipv6service/api/IVirtualSubnet.java | 0 .../api/src/main/yang/ipv6-ndutil.yang | 0 .../api/src/main/yang/neighbor-discovery.yang | 0 ipv6service/impl/pom.xml | 118 +++++++++ .../netvirt/ipv6service/IfMgr.java | 0 .../ipv6service/Ipv6NdUtilServiceImpl.java | 0 .../ipv6service/Ipv6NeighborSolicitation.java | 0 .../netvirt/ipv6service/Ipv6NodeListener.java | 0 .../netvirt/ipv6service/Ipv6PktHandler.java | 0 .../netvirt/ipv6service/Ipv6RouterAdvt.java | 0 .../ipv6service/Ipv6ServiceEosHandler.java | 0 .../Ipv6ServiceInterfaceEventListener.java | 0 .../NeutronNetworkChangeListener.java | 0 .../NeutronPortChangeListener.java | 0 .../NeutronRouterChangeListener.java | 0 .../NeutronSubnetChangeListener.java | 0 .../netvirt/ipv6service/VirtualNetwork.java | 0 .../netvirt/ipv6service/VirtualPort.java | 0 .../netvirt/ipv6service/VirtualRouter.java | 0 .../netvirt/ipv6service/VirtualSubnet.java | 0 .../ipv6service/utils/Ipv6Constants.java | 0 .../ipv6service/utils/Ipv6PeriodicTimer.java | 0 .../utils/Ipv6PeriodicTrQueue.java | 0 .../ipv6service/utils/Ipv6ServiceUtils.java | 0 .../ipv6service/utils/Ipv6TimerWheel.java | 0 .../opendaylight/blueprint/ipv6service.xml | 0 .../Ipv6NeighborSolicitationTest.java | 0 .../ipv6service/Ipv6PktHandlerTest.java | 0 .../netvirt/ipv6service/Ipv6TestUtils.java | 0 .../utils/Ipv6ServiceUtilsTest.java | 0 ipv6service/pom.xml | 51 ++++ ipv6service/shell/pom.xml | 46 ++++ .../ipv6service/shell/ShowIpv6Command.java | 0 .../org/opendaylight/blueprint/blueprint.xml | 0 karaf/pom.xml | 131 +++++++++ model-bgp/pom.xml | 46 ++++ .../src/main/yang/bgp.yang | 0 .../src/main/yang/ebgp.yang | 0 natservice/natservice-api/pom.xml | 42 +++ .../api/CentralizedSwitchScheduler.java | 0 .../natservice/api/SnatServiceListener.java | 0 .../natservice/api/SnatServiceManager.java | 0 .../src/main/yang/odl-nat-rpc.yang | 0 .../natservice-api/src/main/yang/odl-nat.yang | 0 natservice/natservice-impl/pom.xml | 158 +++++++++++ .../cli/DisplayNaptSwithcesCli.java | 0 .../netvirt/natservice/ha/NatDataUtil.java | 0 .../SnatCentralizedSwitchChangeListener.java | 0 .../natservice/ha/SnatNodeEventListener.java | 0 .../WeightedCentralizedSwitchScheduler.java | 0 .../internal/AbstractSnatService.java | 0 .../internal/ConntrackBasedSnatService.java | 0 .../natservice/internal/EventDispatcher.java | 0 .../internal/EvpnDnatFlowProgrammer.java | 0 .../natservice/internal/EvpnNaptSwitchHA.java | 0 .../internal/EvpnSnatFlowProgrammer.java | 0 .../ExternalNetworkGroupInstaller.java | 0 .../ExternalNetworksChangeListener.java | 0 .../internal/ExternalRoutersListener.java | 0 .../ExternalSubnetVpnInstanceListener.java | 0 .../FlatVlanConntrackBasedSnatService.java | 0 .../internal/FloatingIPHandler.java | 0 .../internal/FloatingIPListener.java | 0 .../natservice/internal/IPAddress.java | 0 .../internal/InterfaceStateEventListener.java | 0 .../natservice/internal/NAPTEntryEvent.java | 0 .../internal/NAPTSwitchSelector.java | 0 .../natservice/internal/NaptEventHandler.java | 0 .../internal/NaptFlowRemovedEventHandler.java | 0 .../natservice/internal/NaptManager.java | 0 .../internal/NaptPacketInHandler.java | 0 .../natservice/internal/NaptSwitchHA.java | 0 .../natservice/internal/NatConstants.java | 0 .../natservice/internal/NatEvpnUtil.java | 0 .../NatInterfaceStateChangeListener.java | 0 .../natservice/internal/NatOverVxlanUtil.java | 0 .../internal/NatRouterInterfaceListener.java | 0 .../internal/NatServiceCounters.java | 0 .../NatTunnelInterfaceStateListener.java | 0 .../netvirt/natservice/internal/NatUtil.java | 0 .../internal/RouterDpnChangeListener.java | 0 .../internal/RouterPortsListener.java | 0 .../internal/RouterToVpnListener.java | 0 .../internal/SNATDefaultRouteProgrammer.java | 0 .../natservice/internal/SessionAddress.java | 0 .../internal/SnatServiceImplFactory.java | 0 .../internal/SnatServiceManagerImpl.java | 0 .../internal/SubnetGwMacChangeListener.java | 0 .../internal/SubnetmapListener.java | 0 .../internal/UpgradeStateListener.java | 0 .../internal/VpnFloatingIpHandler.java | 0 .../VxlanGreConntrackBasedSnatService.java | 0 .../rpcservice/NatRpcServiceImpl.java | 0 .../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 .../ExternalNetworksChangeListenerTest.java | 0 .../internal/test/NaptManagerTest.java | 0 .../natservice/internal/test/NatUtilTest.java | 0 natservice/pom.xml | 49 ++++ .../neutronvpn-api/pom.xml | 27 +- .../neutronvpn/api/enums/IpVersionChoice.java | 0 .../neutronvpn/api/l2gw/L2GatewayCache.java | 0 .../neutronvpn/api/l2gw/L2GatewayDevice.java | 0 .../neutronvpn/api/utils/ChangeUtils.java | 0 .../api/utils/NeutronConstants.java | 0 .../neutronvpn/api/utils/NeutronUtils.java | 0 .../interfaces/INeutronVpnManager.java | 0 .../src/main/yang/neutronvpn.yang | 0 neutronvpn/neutronvpn-impl/pom.xml | 183 +++++++++++++ .../netvirt/neutronvpn/HostConfigCache.java | 0 .../IPV6InternetDefaultRouteProgrammer.java | 0 .../NeutronBgpvpnChangeListener.java | 0 .../NeutronExternalSubnetHandler.java | 0 ...loatingToFixedIpMappingChangeListener.java | 0 .../NeutronHostConfigChangeListener.java | 0 .../NeutronNetworkChangeListener.java | 0 .../neutronvpn/NeutronPortChangeListener.java | 0 .../NeutronRouterChangeListener.java | 0 .../NeutronSecurityRuleConstants.java | 0 .../NeutronSecurityRuleListener.java | 0 .../NeutronSubnetChangeListener.java | 0 .../NeutronSubnetGwMacResolver.java | 0 .../NeutronTrunkChangeListener.java | 0 .../netvirt/neutronvpn/NeutronvpnManager.java | 0 .../neutronvpn/NeutronvpnManagerImpl.java | 0 .../neutronvpn/NeutronvpnNatManager.java | 0 .../netvirt/neutronvpn/NeutronvpnUtils.java | 0 .../neutronvpn/UpgradeStateListener.java | 0 .../evpn/manager/NeutronEvpnManager.java | 0 .../evpn/utils/NeutronEvpnUtils.java | 0 .../AddL2GwDevicesToTransportZoneJob.java | 0 .../neutronvpn/l2gw/L2GatewayListener.java | 0 .../neutronvpn/l2gw/L2GatewayUtils.java | 0 .../l2gw/L2GwTransportZoneListener.java | 0 .../initial/netvirt-neutronvpn-config.xml | 0 .../org/opendaylight/blueprint/neutronvpn.xml | 0 .../src/main/yang/neutronvpn-config.yang | 0 .../NeutronPortChangeListenerTest.java | 0 .../neutronvpn-shell/pom.xml | 24 +- .../shell/ConfigureL3VpnCommand.java | 0 .../shell/DhcpConfigureCommand.java | 0 .../neutronvpn/shell/DhcpShowCommand.java | 0 .../shell/ShowNeutronPortsCommand.java | 0 .../netvirt/neutronvpn/shell/ShowSubnet.java | 0 .../shell/ShowVpnConfigCommand.java | 0 .../neutronvpn/shell/ShowVpnIpToPort.java | 0 .../OSGI-INF/blueprint/blueprint.xml | 0 neutronvpn/pom.xml | 51 ++++ .../ovsdb-ui => ovsdb-ui}/bundle/pom.xml | 0 .../OSGI-INF/blueprint/blueprint.xml | 0 .../ovsdb-ui => ovsdb-ui}/module/pom.xml | 0 .../module/src/main/resources/ovsdb/Graph.js | 0 .../src/main/resources/ovsdb/LogicalGraph.js | 0 .../src/main/resources/ovsdb/OvsCore.js | 0 .../src/main/resources/ovsdb/assets/dhcp.png | Bin .../main/resources/ovsdb/assets/router.png | Bin .../src/main/resources/ovsdb/assets/vm.png | Bin .../src/main/resources/ovsdb/css/ovsdb.css | 0 .../main/resources/ovsdb/css/select2.min.css | 0 .../resources/ovsdb/css/toggle-switch.css | 0 .../src/main/resources/ovsdb/lib/d3.min.js | 0 .../resources/ovsdb/lib/select2.full.min.js | 0 .../src/main/resources/ovsdb/lib/sylvester.js | 0 .../module/src/main/resources/ovsdb/matrix.js | 0 .../main/resources/ovsdb/ovsdb.constant.js | 0 .../main/resources/ovsdb/ovsdb.controller.js | 0 .../main/resources/ovsdb/ovsdb.directives.js | 0 .../src/main/resources/ovsdb/ovsdb.module.js | 0 .../main/resources/ovsdb/ovsdb.services.js | 0 .../ovsdb/views/graph_header.tpl.html | 0 .../main/resources/ovsdb/views/index.tpl.html | 0 .../main/resources/ovsdb/views/root.tpl.html | 0 ovsdb-ui/pom.xml | 50 ++++ policyservice/api/pom.xml | 35 +++ .../api/src/main/yang/policy-service.yang | 0 policyservice/impl/pom.xml | 101 +++++++ .../PolicyAceFlowProgrammer.java | 0 .../policyservice/PolicyAceFlowWrapper.java | 0 .../policyservice/PolicyIdManager.java | 0 .../PolicyRouteFlowProgrammer.java | 0 .../PolicyRouteGroupProgrammer.java | 0 .../policyservice/PolicyServiceConstants.java | 0 .../listeners/PolicyAceChangeListener.java | 0 .../listeners/PolicyNodeListener.java | 0 .../PolicyProfileChangeListener.java | 0 .../listeners/TunnelStateChangeListener.java | 0 .../TunnelUnderlayNetworkChangeListener.java | 0 .../listeners/UnderlayNetworkDpnListener.java | 0 .../util/PolicyServiceFlowUtil.java | 0 .../policyservice/util/PolicyServiceUtil.java | 0 .../opendaylight/blueprint/policyservice.xml | 0 policyservice/pom.xml | 50 ++++ pom.xml | 179 +++++++------ qosservice/api/pom.xml | 37 +++ .../api/src/main/yang/qos-alert-config.yang | 0 .../qosservice => qosservice}/impl/pom.xml | 145 +++++----- .../qosservice/QosAlertConfigListener.java | 0 .../netvirt/qosservice/QosAlertEnableCLI.java | 0 .../netvirt/qosservice/QosAlertGenerator.java | 0 .../netvirt/qosservice/QosAlertManager.java | 0 .../qosservice/QosAlertPollIntervalCLI.java | 0 .../netvirt/qosservice/QosAlertPortData.java | 0 .../qosservice/QosAlertThresholdCLI.java | 0 .../netvirt/qosservice/QosConstants.java | 0 .../netvirt/qosservice/QosEosHandler.java | 0 .../QosInterfaceStateChangeListener.java | 0 .../QosNeutronNetworkChangeListener.java | 0 .../QosNeutronPortChangeListener.java | 0 .../netvirt/qosservice/QosNeutronUtils.java | 0 .../netvirt/qosservice/QosNodeListener.java | 0 .../qosservice/QosPolicyChangeListener.java | 0 .../netvirt/qosservice/UuidUtil.java | 0 .../initial/netvirt-qosservice-config.xml | 0 .../src/main/resources/initial/qosservice.cfg | 0 .../org/opendaylight/blueprint/qosservice.xml | 0 .../netvirt/qosservice/UuidUtilTest.java | 0 {vpnservice/qosservice => qosservice}/pom.xml | 3 +- .../sfc-artifacts => sfc-artifacts}/pom.xml | 1 + sfc/classifier/api/pom.xml | 51 ++++ .../api/src/main/yang/netvirt-sfc-acl.yang | 0 .../src/main/yang/netvirt-sfc-classifier.yang | 0 .../api/src/main/yang/netvirt-sfc.yang | 0 sfc/classifier/impl/pom.xml | 147 ++++++++++ .../listeners/NetvirtSfcAclListener.java | 0 .../NetvirtSfcClassifierListener.java | 0 .../listeners/NetvirtSfcRspListener.java | 0 .../classifier/providers/GeniusProvider.java | 0 .../classifier/providers/NetvirtProvider.java | 0 .../providers/OpenFlow13Provider.java | 0 .../sfc/classifier/providers/SfcProvider.java | 0 .../classifier/service/ClassifierService.java | 0 .../service/domain/ClassifierEntry.java | 0 .../domain/api/ClassifierEntryRenderer.java | 0 .../domain/api/ClassifierRenderableEntry.java | 0 .../service/domain/api/ClassifierState.java | 0 .../service/domain/impl/ClassifierUpdate.java | 0 .../impl/ConfigurationClassifierImpl.java | 0 .../service/domain/impl/GeniusRenderer.java | 0 .../service/domain/impl/OpenflowRenderer.java | 0 .../impl/OperationalClassifierImpl.java | 0 .../sfc/classifier/utils/AclMatches.java | 0 .../classifier/utils/LastTaskExecutor.java | 0 .../sfc/classifier/utils/OpenFlow13Utils.java | 0 .../opendaylight/blueprint/sfc-classifier.xml | 0 .../providers/GeniusProviderTest.java | 0 .../providers/GeniusProviderTestParams.java | 0 .../providers/NetvirtProviderTest.java | 0 .../providers/OpenFlow13ProviderTest.java | 0 .../classifier/providers/SfcProviderTest.java | 0 .../providers/TestInterfaceManager.java | 0 .../providers/TestOdlInterfaceRpcService.java | 0 .../service/domain/ClassifierEntryTest.java | 0 .../domain/impl/ClassifierUpdateTest.java | 0 .../sfc/classifier/utils/AclMatchesTest.java | 0 .../utils/LastTaskExecutorTest.java | 0 sfc/classifier/pom.xml | 50 ++++ sfc/pom.xml | 51 ++++ {vpnservice/sfc => sfc}/translator/pom.xml | 0 .../DelegatingDataTreeListener.java | 0 .../translator/INeutronSfcDataProcessor.java | 0 .../sfc/translator/NeutronMdsalHelper.java | 0 .../OpenStackSFCTranslatorProvider.java | 0 .../sfc/translator/SfcMdsalHelper.java | 0 .../FlowClassifierTranslator.java | 0 .../NeutronFlowClassifierListener.java | 0 .../portchain/NeutronPortChainListener.java | 0 .../NeutronPortPairGroupListener.java | 0 .../portchain/NeutronPortPairListener.java | 0 .../portchain/PortChainTranslator.java | 0 .../portchain/PortPairGroupTranslator.java | 0 .../portchain/PortPairTranslator.java | 0 .../opendaylight/blueprint/sfc-translator.xml | 0 statemanager/impl/pom.xml | 85 ++++++ .../netvirt/statemanager/IStateManager.java | 0 .../netvirt/statemanager/StateManager.java | 0 .../opendaylight/blueprint/statemanager.xml | 0 statemanager/pom.xml | 49 ++++ statistics/api/pom.xml | 22 ++ .../api/ICountersInterfaceChangeHandler.java | 0 .../api/src/main/yang/statistics.yang | 0 statistics/impl/pom.xml | 99 +++++++ .../statistics/AbstractCountersService.java | 0 .../statistics/CounterRequestType.java | 0 .../CounterResultDataStructure.java | 0 .../netvirt/statistics/CounterRetriever.java | 0 .../CountersServiceInterfaceListener.java | 0 .../statistics/CountersServiceUtils.java | 0 .../netvirt/statistics/CountersUtils.java | 0 .../statistics/EgressCountersServiceImpl.java | 0 .../statistics/ElementCountersDirection.java | 0 .../statistics/ElementCountersRequest.java | 0 .../IngressCountersServiceImpl.java | 0 .../NodeConnectorStatisticsSupplier.java | 0 ...NodeConnectorStatisticsSupplierOutput.java | 0 .../netvirt/statistics/StatisticsImpl.java | 0 .../statistics/StatisticsProvider.java | 0 .../initial/netvirt-statistics-config.xml | 0 .../org/opendaylight/blueprint/statistics.xml | 0 .../impl/src/main/yang/statistics-config.yang | 0 statistics/pom.xml | 49 ++++ vpnmanager/pom.xml | 50 ++++ vpnmanager/vpnmanager-api/pom.xml | 79 ++++++ .../api/ICentralizedSwitchProvider.java | 0 .../vpnmanager/api/IVpnFootprintService.java | 0 .../netvirt/vpnmanager/api/IVpnManager.java | 0 .../vpnmanager/api/InterfaceUtils.java | 0 .../vpnmanager/api/VpnExtraRouteHelper.java | 0 .../netvirt/vpnmanager/api/VpnHelper.java | 0 .../api/intervpnlink/IVpnLinkService.java | 0 .../api/intervpnlink/InterVpnLinkCache.java | 0 .../InterVpnLinkDataComposite.java | 0 .../src/main/yang/inter-vpn-link.yang | 0 .../vpnmanager-api/src/main/yang/l3vpn.yang | 0 .../src/main/yang/odl-l3vpn.yang | 0 .../vpnmanager-api/src/main/yang/vpn-rpc.yang | 0 .../vpnmanager-impl/pom.xml | 107 ++++---- .../vpnmanager/AlivenessMonitorUtils.java | 0 .../vpnmanager/ArpMonitorEventListener.java | 0 .../vpnmanager/ArpMonitorStartTask.java | 0 .../vpnmanager/ArpMonitorStopTask.java | 0 .../vpnmanager/ArpMonitoringHandler.java | 0 .../vpnmanager/ArpNotificationHandler.java | 0 .../netvirt/vpnmanager/ArpReplyOrRequest.java | 0 .../netvirt/vpnmanager/ArpUtils.java | 0 .../CentralizedSwitchChangeListener.java | 0 .../vpnmanager/CentralizedSwitchProvider.java | 0 .../vpnmanager/DpnInVpnChangeListener.java | 0 .../vpnmanager/FibEntriesListener.java | 0 .../InterfaceStateChangeListener.java | 0 .../netvirt/vpnmanager/MacEntry.java | 0 .../vpnmanager/SubnetOpDpnManager.java | 0 ...bnetRouteInterfaceStateChangeListener.java | 0 .../SubnetRoutePacketInHandler.java | 0 .../vpnmanager/SubnetmapChangeListener.java | 0 .../netvirt/vpnmanager/TransactionUtil.java | 0 .../TunnelEndPointChangeListener.java | 0 .../TunnelInterfaceStateListener.java | 0 .../netvirt/vpnmanager/UpdateData.java | 0 .../netvirt/vpnmanager/VpnConstants.java | 0 .../VpnElanInterfaceChangeListener.java | 0 .../vpnmanager/VpnFootprintService.java | 0 .../vpnmanager/VpnInstanceListener.java | 0 .../vpnmanager/VpnInterfaceManager.java | 0 .../vpnmanager/VpnInterfaceOpListener.java | 0 .../netvirt/vpnmanager/VpnManagerImpl.java | 0 .../netvirt/vpnmanager/VpnNodeListener.java | 0 .../netvirt/vpnmanager/VpnNotifyTask.java | 0 .../netvirt/vpnmanager/VpnOpDataSyncer.java | 0 .../vpnmanager/VpnOpStatusListener.java | 0 .../netvirt/vpnmanager/VpnOperDsUtils.java | 0 .../netvirt/vpnmanager/VpnRpcServiceImpl.java | 0 .../vpnmanager/VpnSubnetRouteHandler.java | 0 .../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 .../InterVpnLinkNodeListener.java | 0 .../InterVpnLinkStateCacheFeeder.java | 0 .../InterVpnLinkStateListener.java | 0 .../intervpnlink/InterVpnLinkUtil.java | 0 .../tasks/InterVpnLinkCleanedCheckerTask.java | 0 .../tasks/InterVpnLinkCreatorTask.java | 0 .../tasks/InterVpnLinkRemoverTask.java | 0 .../impl/L3vpnOverMplsGrePopulator.java | 0 .../impl/L3vpnOverVxlanPopulator.java | 0 .../populator/impl/L3vpnPopulator.java | 0 .../populator/input/L3vpnInput.java | 0 .../populator/intfc/VpnPopulator.java | 0 .../populator/registry/L3vpnRegistry.java | 0 .../utilities/VpnManagerCounters.java | 0 .../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 .../intervpnlink/L3VpnTestCatalog.java | 0 .../test/SubnetOpDpnManagerTest.java | 0 .../vpnmanager/test/VpnServiceTest.java | 0 .../test/VpnSubnetRouteHandlerTest.java | 0 .../vpnmanager-shell/pom.xml | 5 +- .../netvirt/vpnmanager/shell/ShowVpn.java | 0 .../shell/ShowVpnInstanceOpData.java | 0 .../OSGI-INF/blueprint/blueprint.xml | 0 vpnservice/.gitignore | 24 -- vpnservice/.gitreview | 5 - vpnservice/aclservice/api/pom.xml | 49 ---- vpnservice/aclservice/impl/pom.xml | 194 -------------- vpnservice/aclservice/pom.xml | 51 ---- vpnservice/aclservice/shell/pom.xml | 46 ---- vpnservice/bgpmanager/bgpmanager-impl/pom.xml | 138 ---------- vpnservice/bgpmanager/pom.xml | 48 ---- vpnservice/cache/impl/pom.xml | 45 ---- vpnservice/cache/pom.xml | 49 ---- .../cloud-servicechain-api/pom.xml | 33 --- .../cloud-servicechain-impl/pom.xml | 95 ------- vpnservice/cloud-servicechain/pom.xml | 46 ---- vpnservice/coe/api/pom.xml | 33 --- vpnservice/coe/impl/pom.xml | 80 ------ vpnservice/coe/pom.xml | 49 ---- vpnservice/commons/pom.xml | 49 ---- .../dhcpservice/dhcpservice-api/pom.xml | 36 --- .../dhcpservice/dhcpservice-impl/pom.xml | 146 ---------- vpnservice/dhcpservice/pom.xml | 47 ---- vpnservice/distribution/karaf/pom.xml | 129 --------- .../elanmanager/elanmanager-api/pom.xml | 64 ----- .../elanmanager/elanmanager-impl/pom.xml | 246 ----------------- vpnservice/elanmanager/pom.xml | 47 ---- vpnservice/fibmanager/fibmanager-api/pom.xml | 63 ----- vpnservice/fibmanager/fibmanager-impl/pom.xml | 92 ------- .../fibmanager/fibmanager-shell/pom.xml | 41 --- vpnservice/fibmanager/pom.xml | 49 ---- vpnservice/ipv6service/api/pom.xml | 35 --- vpnservice/ipv6service/impl/pom.xml | 117 -------- vpnservice/ipv6service/pom.xml | 50 ---- vpnservice/ipv6service/shell/pom.xml | 47 ---- vpnservice/model-bgp/pom.xml | 46 ---- vpnservice/natservice/natservice-api/pom.xml | 40 --- vpnservice/natservice/natservice-impl/pom.xml | 156 ----------- vpnservice/natservice/pom.xml | 48 ---- vpnservice/neutronvpn/neutronvpn-impl/pom.xml | 181 ------------- vpnservice/neutronvpn/pom.xml | 50 ---- vpnservice/ovsdb-ui/pom.xml | 49 ---- vpnservice/policyservice/api/pom.xml | 32 --- vpnservice/policyservice/impl/pom.xml | 101 ------- vpnservice/policyservice/pom.xml | 49 ---- vpnservice/pom.xml | 90 ------- vpnservice/qosservice/api/pom.xml | 34 --- vpnservice/sfc/classifier/api/pom.xml | 52 ---- vpnservice/sfc/classifier/impl/pom.xml | 148 ----------- vpnservice/sfc/classifier/pom.xml | 49 ---- vpnservice/sfc/pom.xml | 49 ---- vpnservice/statemanager/impl/pom.xml | 86 ------ vpnservice/statemanager/pom.xml | 49 ---- vpnservice/statistics/api/pom.xml | 18 -- vpnservice/statistics/impl/pom.xml | 97 ------- vpnservice/statistics/pom.xml | 57 ---- vpnservice/vpnmanager/pom.xml | 49 ---- vpnservice/vpnmanager/vpnmanager-api/pom.xml | 77 ------ 859 files changed, 4294 insertions(+), 4247 deletions(-) create mode 100644 aclservice/api/pom.xml rename {vpnservice/aclservice => aclservice}/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java (100%) rename {vpnservice/aclservice => aclservice}/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceListener.java (100%) rename {vpnservice/aclservice => aclservice}/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java (100%) rename {vpnservice/aclservice => aclservice}/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java (100%) rename {vpnservice/aclservice => aclservice}/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java (100%) rename {vpnservice/aclservice => aclservice}/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/IAclServiceUtil.java (100%) rename {vpnservice/aclservice => aclservice}/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java (100%) rename {vpnservice/aclservice => aclservice}/api/src/main/yang/acl-live-statistics.yang (100%) rename {vpnservice/aclservice => aclservice}/api/src/main/yang/aclservice.yang (100%) create mode 100644 aclservice/impl/pom.xml rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceManagerImpl.java (99%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclElanInterfaceListener.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceImpl.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtil.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtilImpl.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConntrackClassifierType.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtilFacade.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/resources/initial/netvirt-aclservice-config.xml (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml (100%) rename {vpnservice/aclservice => aclservice}/impl/src/main/yang/aclservice-config.yang (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/TestOdlDirectStatisticsService.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBaseIPv6.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.xtend (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedSubnetIpPrefixBuilder.xtend (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataBrokerPairsUtil.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataTreeIdentifierDataObjectPairBuilder.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/package-info.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtilTest.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilderTest.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/MethodInvocationParamSaver.java (100%) rename {vpnservice/aclservice => aclservice}/impl/src/test/resources/simplelogger.properties (100%) create mode 100644 aclservice/pom.xml create mode 100644 aclservice/shell/pom.xml rename {vpnservice/aclservice => aclservice}/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java (99%) rename {vpnservice/aclservice => aclservice}/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml (100%) rename {vpnservice/alarm => alarm}/impl/pom.xml (100%) rename {vpnservice/alarm => alarm}/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java (100%) rename {vpnservice/alarm => alarm}/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java (100%) rename {vpnservice/alarm => alarm}/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java (100%) rename {vpnservice/alarm => alarm}/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java (100%) rename {vpnservice/alarm => alarm}/impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java (100%) rename {vpnservice/alarm => alarm}/impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java (100%) rename {vpnservice/alarm => alarm}/pom.xml (79%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-api/pom.xml (86%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java (100%) create mode 100644 bgpmanager/bgpmanager-impl/pom.xml rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java (100%) rename {vpnservice/bgpmanager => bgpmanager}/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java (100%) create mode 100644 bgpmanager/pom.xml create mode 100644 cache/impl/pom.xml rename {vpnservice/cache => cache}/impl/src/main/java/org/opendaylight/netvirt/cache/impl/l2gw/L2GatewayCacheImpl.java (100%) rename {vpnservice/cache => cache}/impl/src/main/resources/org/opendaylight/blueprint/cache-impl.xml (100%) create mode 100644 cache/pom.xml create mode 100644 cloud-servicechain/cloud-servicechain-api/pom.xml rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-api/src/main/yang/cloud-servicechain-state.yang (100%) create mode 100644 cloud-servicechain/cloud-servicechain-impl/pom.xml rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java (100%) rename {vpnservice/cloud-servicechain => cloud-servicechain}/cloud-servicechain-impl/src/test/resources/simplelogger.properties (100%) create mode 100644 cloud-servicechain/pom.xml create mode 100644 coe/api/pom.xml create mode 100644 coe/impl/pom.xml rename {vpnservice/coe => coe}/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java (100%) rename {vpnservice/coe => coe}/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java (100%) rename {vpnservice/coe => coe}/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java (100%) rename {vpnservice/coe => coe}/impl/src/main/resources/org/opendaylight/blueprint/coe-renderer.xml (100%) create mode 100644 coe/pom.xml rename {vpnservice/commons => commons}/binding-parent/pom.xml (100%) create mode 100644 commons/pom.xml create mode 100644 dhcpservice/dhcpservice-api/pom.xml rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-api/src/main/yang/dhcp.yang (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-api/src/main/yang/dhcp_allocation_pool.yang (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-api/src/main/yang/dhcpservice-api.yang (100%) create mode 100644 dhcpservice/dhcpservice-impl/pom.xml rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml (100%) rename {vpnservice/dhcpservice => dhcpservice}/dhcpservice-impl/src/main/yang/dhcpservice-config.yang (100%) create mode 100644 dhcpservice/pom.xml create mode 100644 elanmanager/elanmanager-api/pom.xml rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/yang/elan-statistics.yang (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/yang/elan.yang (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/yang/etree.yang (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-api/src/main/yang/scalein-rpc.yang (100%) create mode 100644 elanmanager/elanmanager-impl/pom.xml rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/main/yang/elanmanager-config.yang (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java (100%) rename {vpnservice/elanmanager => elanmanager}/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java (100%) create mode 100644 elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/.ExpectedObjects.java._trace create mode 100644 elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java create mode 100644 elanmanager/pom.xml rename {vpnservice/features => features}/netvirt-features/pom.xml (83%) rename {vpnservice/features => features}/netvirt-sfc-features/pom.xml (91%) rename {vpnservice/features => features}/odl-netvirt-api/pom.xml (98%) rename {vpnservice/features => features}/odl-netvirt-coe/pom.xml (93%) rename {vpnservice/features => features}/odl-netvirt-impl/pom.xml (97%) rename {vpnservice/features => features}/odl-netvirt-impl/src/main/feature/feature.xml (100%) rename {vpnservice/features => features}/odl-netvirt-openstack/pom.xml (93%) rename {vpnservice/features => features}/odl-netvirt-sfc/pom.xml (94%) rename {vpnservice/features => features}/odl-netvirt-ui/pom.xml (92%) rename {vpnservice/features => features}/pom.xml (87%) create mode 100644 fibmanager/fibmanager-api/pom.xml rename {vpnservice/fibmanager => fibmanager}/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-api/src/main/yang/fib-rpc.yang (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-api/src/main/yang/l3nexthop.yang (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-api/src/main/yang/odl-fib.yang (100%) create mode 100644 fibmanager/fibmanager-impl/pom.xml rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java (100%) create mode 100644 fibmanager/fibmanager-shell/pom.xml rename {vpnservice/fibmanager => fibmanager}/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java (100%) rename {vpnservice/fibmanager => fibmanager}/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml (100%) create mode 100644 fibmanager/pom.xml create mode 100644 ipv6service/api/pom.xml rename {vpnservice/ipv6service => ipv6service}/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/ElementCache.java (100%) rename {vpnservice/ipv6service => ipv6service}/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualNetwork.java (100%) rename {vpnservice/ipv6service => ipv6service}/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualPort.java (100%) rename {vpnservice/ipv6service => ipv6service}/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualRouter.java (100%) rename {vpnservice/ipv6service => ipv6service}/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualSubnet.java (100%) rename {vpnservice/ipv6service => ipv6service}/api/src/main/yang/ipv6-ndutil.yang (100%) rename {vpnservice/ipv6service => ipv6service}/api/src/main/yang/neighbor-discovery.yang (100%) create mode 100644 ipv6service/impl/pom.xml rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NdUtilServiceImpl.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitation.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandler.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceEosHandler.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceInterfaceEventListener.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronNetworkChangeListener.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronSubnetChangeListener.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTimer.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTrQueue.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6TimerWheel.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/main/resources/org/opendaylight/blueprint/ipv6service.xml (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitationTest.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandlerTest.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6TestUtils.java (100%) rename {vpnservice/ipv6service => ipv6service}/impl/src/test/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtilsTest.java (100%) create mode 100644 ipv6service/pom.xml create mode 100644 ipv6service/shell/pom.xml rename {vpnservice/ipv6service => ipv6service}/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java (100%) rename {vpnservice/ipv6service => ipv6service}/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml (100%) create mode 100644 karaf/pom.xml create mode 100644 model-bgp/pom.xml rename {vpnservice/model-bgp => model-bgp}/src/main/yang/bgp.yang (100%) rename {vpnservice/model-bgp => model-bgp}/src/main/yang/ebgp.yang (100%) create mode 100644 natservice/natservice-api/pom.xml rename {vpnservice/natservice => natservice}/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java (100%) rename {vpnservice/natservice => natservice}/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java (100%) rename {vpnservice/natservice => natservice}/natservice-api/src/main/yang/odl-nat-rpc.yang (100%) rename {vpnservice/natservice => natservice}/natservice-api/src/main/yang/odl-nat.yang (100%) create mode 100644 natservice/natservice-impl/pom.xml rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/resources/initial/netvirt-natservice-config.xml (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/resources/org/opendaylight/blueprint/commands.xml (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/main/yang/natservice-config.yang (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java (100%) rename {vpnservice/natservice => natservice}/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java (100%) create mode 100644 natservice/pom.xml rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/pom.xml (99%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-api/src/main/yang/neutronvpn.yang (100%) create mode 100644 neutronvpn/neutronvpn-impl/pom.xml rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/resources/initial/netvirt-neutronvpn-config.xml (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/main/yang/neutronvpn-config.yang (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/pom.xml (91%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java (100%) rename {vpnservice/neutronvpn => neutronvpn}/neutronvpn-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml (100%) create mode 100644 neutronvpn/pom.xml rename {vpnservice/ovsdb-ui => ovsdb-ui}/bundle/pom.xml (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/pom.xml (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/Graph.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/LogicalGraph.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/OvsCore.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/assets/dhcp.png (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/assets/router.png (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/assets/vm.png (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/css/ovsdb.css (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/css/select2.min.css (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/css/toggle-switch.css (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/lib/d3.min.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/lib/select2.full.min.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/lib/sylvester.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/matrix.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/ovsdb.constant.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/ovsdb.controller.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/ovsdb.directives.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/ovsdb.module.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/ovsdb.services.js (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/views/graph_header.tpl.html (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/views/index.tpl.html (100%) rename {vpnservice/ovsdb-ui => ovsdb-ui}/module/src/main/resources/ovsdb/views/root.tpl.html (100%) create mode 100644 ovsdb-ui/pom.xml create mode 100644 policyservice/api/pom.xml rename {vpnservice/policyservice => policyservice}/api/src/main/yang/policy-service.yang (100%) create mode 100644 policyservice/impl/pom.xml rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowWrapper.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyIdManager.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyServiceConstants.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyAceChangeListener.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyNodeListener.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyProfileChangeListener.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelUnderlayNetworkChangeListener.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceFlowUtil.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java (100%) rename {vpnservice/policyservice => policyservice}/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml (100%) create mode 100644 policyservice/pom.xml create mode 100644 qosservice/api/pom.xml rename {vpnservice/qosservice => qosservice}/api/src/main/yang/qos-alert-config.yang (100%) rename {vpnservice/qosservice => qosservice}/impl/pom.xml (53%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertConfigListener.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertGenerator.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPortData.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosConstants.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosEosHandler.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNodeListener.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/java/org/opendaylight/netvirt/qosservice/UuidUtil.java (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/resources/initial/netvirt-qosservice-config.xml (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/resources/initial/qosservice.cfg (100%) rename {vpnservice/qosservice => qosservice}/impl/src/main/resources/org/opendaylight/blueprint/qosservice.xml (100%) rename {vpnservice/qosservice => qosservice}/impl/src/test/java/org/opendaylight/netvirt/qosservice/UuidUtilTest.java (100%) rename {vpnservice/qosservice => qosservice}/pom.xml (99%) rename {vpnservice/sfc-artifacts => sfc-artifacts}/pom.xml (97%) create mode 100644 sfc/classifier/api/pom.xml rename {vpnservice/sfc => sfc}/classifier/api/src/main/yang/netvirt-sfc-acl.yang (100%) rename {vpnservice/sfc => sfc}/classifier/api/src/main/yang/netvirt-sfc-classifier.yang (100%) rename {vpnservice/sfc => sfc}/classifier/api/src/main/yang/netvirt-sfc.yang (100%) create mode 100644 sfc/classifier/impl/pom.xml rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcAclListener.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcClassifierListener.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcRspListener.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProvider.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/ClassifierService.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierEntryRenderer.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierRenderableEntry.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierState.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdate.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/GeniusRenderer.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OpenflowRenderer.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OperationalClassifierImpl.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatches.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutor.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/main/resources/org/opendaylight/blueprint/sfc-classifier.xml (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTest.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTestParams.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProviderTest.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestOdlInterfaceRpcService.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntryTest.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdateTest.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatchesTest.java (100%) rename {vpnservice/sfc => sfc}/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutorTest.java (100%) create mode 100644 sfc/classifier/pom.xml create mode 100644 sfc/pom.xml rename {vpnservice/sfc => sfc}/translator/pom.xml (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/OpenStackSFCTranslatorProvider.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java (100%) rename {vpnservice/sfc => sfc}/translator/src/main/resources/org/opendaylight/blueprint/sfc-translator.xml (100%) create mode 100644 statemanager/impl/pom.xml rename {vpnservice/statemanager => statemanager}/impl/src/main/java/org/opendaylight/netvirt/statemanager/IStateManager.java (100%) rename {vpnservice/statemanager => statemanager}/impl/src/main/java/org/opendaylight/netvirt/statemanager/StateManager.java (100%) rename {vpnservice/statemanager => statemanager}/impl/src/main/resources/org/opendaylight/blueprint/statemanager.xml (100%) create mode 100644 statemanager/pom.xml create mode 100644 statistics/api/pom.xml rename {vpnservice/statistics => statistics}/api/src/main/java/org/opendaylight/netvirt/statistics/api/ICountersInterfaceChangeHandler.java (100%) rename {vpnservice/statistics => statistics}/api/src/main/yang/statistics.yang (100%) create mode 100644 statistics/impl/pom.xml rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/AbstractCountersService.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRequestType.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterResultDataStructure.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceInterfaceListener.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/EgressCountersServiceImpl.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersDirection.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/IngressCountersServiceImpl.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplier.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplierOutput.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java (100%) rename {vpnservice/statistics => statistics}/impl/src/main/resources/initial/netvirt-statistics-config.xml (100%) rename {vpnservice/statistics => statistics}/impl/src/main/resources/org/opendaylight/blueprint/statistics.xml (100%) rename {vpnservice/statistics => statistics}/impl/src/main/yang/statistics-config.yang (100%) create mode 100644 statistics/pom.xml create mode 100644 vpnmanager/pom.xml create mode 100644 vpnmanager/vpnmanager-api/pom.xml rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/yang/inter-vpn-link.yang (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/yang/l3vpn.yang (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/yang/odl-l3vpn.yang (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-api/src/main/yang/vpn-rpc.yang (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/pom.xml (90%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/resources/initial/netvirt-vpnmanager-config.xml (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/main/yang/vpnmanager-config.yang (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-shell/pom.xml (99%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java (100%) rename {vpnservice/vpnmanager => vpnmanager}/vpnmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml (100%) delete mode 100644 vpnservice/.gitignore delete mode 100644 vpnservice/.gitreview delete mode 100644 vpnservice/aclservice/api/pom.xml delete mode 100644 vpnservice/aclservice/impl/pom.xml delete mode 100644 vpnservice/aclservice/pom.xml delete mode 100644 vpnservice/aclservice/shell/pom.xml delete mode 100644 vpnservice/bgpmanager/bgpmanager-impl/pom.xml delete mode 100644 vpnservice/bgpmanager/pom.xml delete mode 100644 vpnservice/cache/impl/pom.xml delete mode 100644 vpnservice/cache/pom.xml delete mode 100644 vpnservice/cloud-servicechain/cloud-servicechain-api/pom.xml delete mode 100644 vpnservice/cloud-servicechain/cloud-servicechain-impl/pom.xml delete mode 100644 vpnservice/cloud-servicechain/pom.xml delete mode 100644 vpnservice/coe/api/pom.xml delete mode 100644 vpnservice/coe/impl/pom.xml delete mode 100644 vpnservice/coe/pom.xml delete mode 100644 vpnservice/commons/pom.xml delete mode 100644 vpnservice/dhcpservice/dhcpservice-api/pom.xml delete mode 100644 vpnservice/dhcpservice/dhcpservice-impl/pom.xml delete mode 100644 vpnservice/dhcpservice/pom.xml delete mode 100644 vpnservice/distribution/karaf/pom.xml delete mode 100644 vpnservice/elanmanager/elanmanager-api/pom.xml delete mode 100644 vpnservice/elanmanager/elanmanager-impl/pom.xml delete mode 100644 vpnservice/elanmanager/pom.xml delete mode 100644 vpnservice/fibmanager/fibmanager-api/pom.xml delete mode 100644 vpnservice/fibmanager/fibmanager-impl/pom.xml delete mode 100644 vpnservice/fibmanager/fibmanager-shell/pom.xml delete mode 100644 vpnservice/fibmanager/pom.xml delete mode 100644 vpnservice/ipv6service/api/pom.xml delete mode 100644 vpnservice/ipv6service/impl/pom.xml delete mode 100644 vpnservice/ipv6service/pom.xml delete mode 100644 vpnservice/ipv6service/shell/pom.xml delete mode 100644 vpnservice/model-bgp/pom.xml delete mode 100644 vpnservice/natservice/natservice-api/pom.xml delete mode 100644 vpnservice/natservice/natservice-impl/pom.xml delete mode 100644 vpnservice/natservice/pom.xml delete mode 100644 vpnservice/neutronvpn/neutronvpn-impl/pom.xml delete mode 100644 vpnservice/neutronvpn/pom.xml delete mode 100644 vpnservice/ovsdb-ui/pom.xml delete mode 100644 vpnservice/policyservice/api/pom.xml delete mode 100644 vpnservice/policyservice/impl/pom.xml delete mode 100644 vpnservice/policyservice/pom.xml delete mode 100644 vpnservice/pom.xml delete mode 100644 vpnservice/qosservice/api/pom.xml delete mode 100644 vpnservice/sfc/classifier/api/pom.xml delete mode 100644 vpnservice/sfc/classifier/impl/pom.xml delete mode 100644 vpnservice/sfc/classifier/pom.xml delete mode 100644 vpnservice/sfc/pom.xml delete mode 100644 vpnservice/statemanager/impl/pom.xml delete mode 100644 vpnservice/statemanager/pom.xml delete mode 100644 vpnservice/statistics/api/pom.xml delete mode 100644 vpnservice/statistics/impl/pom.xml delete mode 100644 vpnservice/statistics/pom.xml delete mode 100644 vpnservice/vpnmanager/pom.xml delete mode 100644 vpnservice/vpnmanager/vpnmanager-api/pom.xml diff --git a/aclservice/api/pom.xml b/aclservice/api/pom.xml new file mode 100644 index 0000000000..a1da309f32 --- /dev/null +++ b/aclservice/api/pom.xml @@ -0,0 +1,51 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + aclservice-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal.model + ietf-access-control-list + + + org.opendaylight.mdsal.model + ietf-interfaces + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + yang-ext + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java similarity index 100% rename from vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java rename to aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclInterfaceCache.java diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceListener.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceListener.java similarity index 100% rename from vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceListener.java rename to aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceListener.java diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java similarity index 100% rename from vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java rename to aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/AclServiceManager.java diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java similarity index 100% rename from vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java rename to aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclDataCache.java diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java similarity index 100% rename from vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java rename to aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/IAclServiceUtil.java b/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/IAclServiceUtil.java similarity index 100% rename from vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/IAclServiceUtil.java rename to aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/IAclServiceUtil.java diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java b/aclservice/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java similarity index 100% rename from vpnservice/aclservice/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java rename to aclservice/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java diff --git a/vpnservice/aclservice/api/src/main/yang/acl-live-statistics.yang b/aclservice/api/src/main/yang/acl-live-statistics.yang similarity index 100% rename from vpnservice/aclservice/api/src/main/yang/acl-live-statistics.yang rename to aclservice/api/src/main/yang/acl-live-statistics.yang diff --git a/vpnservice/aclservice/api/src/main/yang/aclservice.yang b/aclservice/api/src/main/yang/aclservice.yang similarity index 100% rename from vpnservice/aclservice/api/src/main/yang/aclservice.yang rename to aclservice/api/src/main/yang/aclservice.yang diff --git a/aclservice/impl/pom.xml b/aclservice/impl/pom.xml new file mode 100644 index 0000000000..c5e3f7111b --- /dev/null +++ b/aclservice/impl/pom.xml @@ -0,0 +1,194 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + aclservice-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + ${project.groupId} + aclservice-api + ${project.version} + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-binding-broker-impl + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + org.opendaylight.genius + idmanager-api + ${genius.version} + + + org.opendaylight.infrautils + inject + ${infrautils.version} + + + org.opendaylight.infrautils + jobcoordinator-impl + ${infrautils.version} + test + + + com.googlecode.java-ipv6 + java-ipv6 + 0.16 + + + org.apache.karaf.shell + org.apache.karaf.shell.console + provided + + + + + org.opendaylight.infrautils + infrautils-testutils + ${infrautils.version} + test + + + org.opendaylight.infrautils + inject.guice.testutils + ${infrautils.version} + test + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + test-jar + test + + + org.opendaylight.genius + mdsalutil-testutils + ${genius.version} + test + + + org.opendaylight.genius + testutils + ${genius.version} + test + + + org.opendaylight.genius + interfacemanager-impl + ${genius.version} + test + + + org.opendaylight.yangtools + testutils + test + + + org.opendaylight.controller + sal-binding-broker-impl + test-jar + test + + + org.opendaylight.mdsal + mdsal-binding-test-utils + test + + + org.immutables + value + test + + + com.google.truth + truth + test + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/netvirt-aclservice-config.xml + + xml + config + + + + + + + + org.eclipse.xtend + xtend-maven-plugin + + + + diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclInterfaceCacheImpl.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceManagerImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceManagerImpl.java similarity index 99% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceManagerImpl.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceManagerImpl.java index 35ab07f37e..931a4ca399 100644 --- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceManagerImpl.java +++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceManagerImpl.java @@ -35,6 +35,7 @@ public class AclServiceManagerImpl implements AclServiceManager { addAclServiceListner(factory.createEgressAclServiceImpl()); LOG.info("ACL Service Initiated"); + LOG.info("Just a test"); } @Override diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclElanInterfaceListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclElanInterfaceListener.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclElanInterfaceListener.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclElanInterfaceListener.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsHelper.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceImpl.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceImpl.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceImpl.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtil.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtil.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtil.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtil.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtilImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtilImpl.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtilImpl.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclClusterUtilImpl.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConntrackClassifierType.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConntrackClassifierType.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConntrackClassifierType.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConntrackClassifierType.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclConstants.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtil.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclNodeDefaultFlowsTxBuilder.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilder.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtilFacade.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtilFacade.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtilFacade.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtilFacade.java diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java similarity index 100% rename from vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java rename to aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java diff --git a/vpnservice/aclservice/impl/src/main/resources/initial/netvirt-aclservice-config.xml b/aclservice/impl/src/main/resources/initial/netvirt-aclservice-config.xml similarity index 100% rename from vpnservice/aclservice/impl/src/main/resources/initial/netvirt-aclservice-config.xml rename to aclservice/impl/src/main/resources/initial/netvirt-aclservice-config.xml diff --git a/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml b/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml similarity index 100% rename from vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml rename to aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml diff --git a/vpnservice/aclservice/impl/src/main/yang/aclservice-config.yang b/aclservice/impl/src/main/yang/aclservice-config.yang similarity index 100% rename from vpnservice/aclservice/impl/src/main/yang/aclservice-config.yang rename to aclservice/impl/src/main/yang/aclservice-config.yang diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/AclLiveStatisticsRpcServiceTest.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/TestOdlDirectStatisticsService.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/TestOdlDirectStatisticsService.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/TestOdlDirectStatisticsService.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/stats/TestOdlDirectStatisticsService.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceModule.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulIPv6Test.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceStatefulTest.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBaseIPv6.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBaseIPv6.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBaseIPv6.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBaseIPv6.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsBase.xtend diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStateful.xtend diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/FlowEntryObjectsStatefulIPv6.xtend diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.xtend similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.xtend rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.xtend diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedSubnetIpPrefixBuilder.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedSubnetIpPrefixBuilder.xtend similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedSubnetIpPrefixBuilder.xtend rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedSubnetIpPrefixBuilder.xtend diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataBrokerPairsUtil.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataBrokerPairsUtil.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataBrokerPairsUtil.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataBrokerPairsUtil.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataTreeIdentifierDataObjectPairBuilder.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataTreeIdentifierDataObjectPairBuilder.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataTreeIdentifierDataObjectPairBuilder.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/DataTreeIdentifierDataObjectPairBuilder.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/package-info.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/package-info.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/package-info.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/infra/package-info.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtilTest.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtilTest.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtilTest.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclDataUtilTest.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilderTest.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilderTest.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilderTest.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceOFFlowBuilderTest.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/MethodInvocationParamSaver.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/MethodInvocationParamSaver.java similarity index 100% rename from vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/MethodInvocationParamSaver.java rename to aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/MethodInvocationParamSaver.java diff --git a/vpnservice/aclservice/impl/src/test/resources/simplelogger.properties b/aclservice/impl/src/test/resources/simplelogger.properties similarity index 100% rename from vpnservice/aclservice/impl/src/test/resources/simplelogger.properties rename to aclservice/impl/src/test/resources/simplelogger.properties diff --git a/aclservice/pom.xml b/aclservice/pom.xml new file mode 100644 index 0000000000..1b01899cd8 --- /dev/null +++ b/aclservice/pom.xml @@ -0,0 +1,51 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + aclservice + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + api + impl + shell + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/aclservice/shell/pom.xml b/aclservice/shell/pom.xml new file mode 100644 index 0000000000..a1e7906464 --- /dev/null +++ b/aclservice/shell/pom.xml @@ -0,0 +1,46 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + aclservice-shell + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + ${project.groupId} + aclservice-api + ${project.version} + + + org.apache.karaf.shell + org.apache.karaf.shell.console + provided + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + org.opendaylight.netvirt + aclservice-impl + 0.6.0-SNAPSHOT + + + diff --git a/vpnservice/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java b/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java similarity index 99% rename from vpnservice/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java rename to aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java index 06e913acd1..6ded914529 100644 --- a/vpnservice/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java +++ b/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java @@ -365,6 +365,3 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { } } } - - - diff --git a/vpnservice/aclservice/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/aclservice/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml similarity index 100% rename from vpnservice/aclservice/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml rename to aclservice/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml diff --git a/vpnservice/alarm/impl/pom.xml b/alarm/impl/pom.xml similarity index 100% rename from vpnservice/alarm/impl/pom.xml rename to alarm/impl/pom.xml diff --git a/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java similarity index 100% rename from vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java rename to alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java diff --git a/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java similarity index 100% rename from vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java rename to alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java diff --git a/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java similarity index 100% rename from vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java rename to alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java diff --git a/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java similarity index 100% rename from vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java rename to alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java diff --git a/vpnservice/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java b/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java similarity index 100% rename from vpnservice/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java rename to alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java diff --git a/vpnservice/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java b/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java similarity index 100% rename from vpnservice/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java rename to alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java diff --git a/vpnservice/alarm/pom.xml b/alarm/pom.xml similarity index 79% rename from vpnservice/alarm/pom.xml rename to alarm/pom.xml index e24e4c1baa..5944fbaf2e 100644 --- a/vpnservice/alarm/pom.xml +++ b/alarm/pom.xml @@ -1,14 +1,13 @@ - 4.0.0 org.opendaylight.odlparent @@ -22,11 +21,13 @@ 0.6.0-SNAPSHOT ODL :: netvirt :: ${project.artifactId} pom + 4.0.0 impl + @@ -45,5 +46,4 @@ - diff --git a/vpnservice/bgpmanager/bgpmanager-api/pom.xml b/bgpmanager/bgpmanager-api/pom.xml similarity index 86% rename from vpnservice/bgpmanager/bgpmanager-api/pom.xml rename to bgpmanager/bgpmanager-api/pom.xml index 88711090cd..58f8cd94f9 100644 --- a/vpnservice/bgpmanager/bgpmanager-api/pom.xml +++ b/bgpmanager/bgpmanager-api/pom.xml @@ -1,12 +1,13 @@ - - + org.opendaylight.netvirt @@ -15,10 +16,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ../../commons/binding-parent - 4.0.0 bgpmanager-api ODL :: netvirt :: ${project.artifactId} bundle + 4.0.0 + ${project.groupId} diff --git a/vpnservice/bgpmanager/bgpmanager-api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java b/bgpmanager/bgpmanager-api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java rename to bgpmanager/bgpmanager-api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java diff --git a/bgpmanager/bgpmanager-impl/pom.xml b/bgpmanager/bgpmanager-impl/pom.xml new file mode 100644 index 0000000000..9e2a207a7a --- /dev/null +++ b/bgpmanager/bgpmanager-impl/pom.xml @@ -0,0 +1,138 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + bgpmanager-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + ${project.groupId} + bgpmanager-api + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + ${project.groupId} + model-bgp + ${model.bgp.version} + + + org.apache.thrift + libthrift + 0.9.3 + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + org.opendaylight.controller + sal-binding-broker-impl + test + + + org.opendaylight.controller + sal-binding-broker-impl + test + test-jar + + + org.apache.karaf.shell + org.apache.karaf.shell.console + provided + + + com.google.truth + truth + test + + + org.opendaylight.infrautils + metrics-api + ${infrautils.version} + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + **/gen/**/* + + + + org.apache.maven.plugins + maven-pmd-plugin + + **/gen/**/* + + + + org.codehaus.mojo + findbugs-maven-plugin + + true + + + org.opendaylight.netvirt.bgpmanager.*,org.opendaylight.netvirt.bgpmanager.commands.*,org.opendaylight.netvirt.bgpmanager.oam.*,org.opendaylight.netvirt.bgpmanager.thrift.client.*,org.opendaylight.netvirt.bgpmanager.thrift.server.* + + + + + + diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/DisplayBgpConfigCli.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/EvpnRdNetworkListener.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/RetryOnException.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Commands.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Connect.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Network.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Vrf.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmErrorCodes.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmStatus.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpConstants.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpJMXAlarmAgent.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarm.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpNbrControlPathAlarmMBean.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterException.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpConfigurator.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/BgpUpdater.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Routes.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/Update.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_afi.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/af_safi.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/encap_type.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/layer_type.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/protocol_type.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/gen/qbgpConstants.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/idl/qbgp.thrift diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java rename to bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml b/bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml rename to bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/bgpmanager.xml diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml b/bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml rename to bgpmanager/bgpmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java rename to bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/AbstractMockFibManager.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java rename to bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java rename to bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/MockFibManager.java diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java similarity index 100% rename from vpnservice/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java rename to bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouterAddNeighborTest.java diff --git a/bgpmanager/pom.xml b/bgpmanager/pom.xml new file mode 100644 index 0000000000..054b6f0091 --- /dev/null +++ b/bgpmanager/pom.xml @@ -0,0 +1,50 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + bgpmanager + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + bgpmanager-api + bgpmanager-impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/cache/impl/pom.xml b/cache/impl/pom.xml new file mode 100644 index 0000000000..44c1e44bc6 --- /dev/null +++ b/cache/impl/pom.xml @@ -0,0 +1,46 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + cache-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + org.ops4j.pax.cdi + pax-cdi-api + true + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + + + diff --git a/vpnservice/cache/impl/src/main/java/org/opendaylight/netvirt/cache/impl/l2gw/L2GatewayCacheImpl.java b/cache/impl/src/main/java/org/opendaylight/netvirt/cache/impl/l2gw/L2GatewayCacheImpl.java similarity index 100% rename from vpnservice/cache/impl/src/main/java/org/opendaylight/netvirt/cache/impl/l2gw/L2GatewayCacheImpl.java rename to cache/impl/src/main/java/org/opendaylight/netvirt/cache/impl/l2gw/L2GatewayCacheImpl.java diff --git a/vpnservice/cache/impl/src/main/resources/org/opendaylight/blueprint/cache-impl.xml b/cache/impl/src/main/resources/org/opendaylight/blueprint/cache-impl.xml similarity index 100% rename from vpnservice/cache/impl/src/main/resources/org/opendaylight/blueprint/cache-impl.xml rename to cache/impl/src/main/resources/org/opendaylight/blueprint/cache-impl.xml diff --git a/cache/pom.xml b/cache/pom.xml new file mode 100644 index 0000000000..4b36c9edea --- /dev/null +++ b/cache/pom.xml @@ -0,0 +1,49 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + cache + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/cloud-servicechain/cloud-servicechain-api/pom.xml b/cloud-servicechain/cloud-servicechain-api/pom.xml new file mode 100644 index 0000000000..b792516d4a --- /dev/null +++ b/cloud-servicechain/cloud-servicechain-api/pom.xml @@ -0,0 +1,35 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + cloud-servicechain-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal.model + yang-ext + + + ${project.groupId} + elanmanager-api + ${project.version} + + + diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java b/cloud-servicechain/cloud-servicechain-api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java rename to cloud-servicechain/cloud-servicechain-api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-api/src/main/yang/cloud-servicechain-state.yang b/cloud-servicechain/cloud-servicechain-api/src/main/yang/cloud-servicechain-state.yang similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-api/src/main/yang/cloud-servicechain-state.yang rename to cloud-servicechain/cloud-servicechain-api/src/main/yang/cloud-servicechain-state.yang diff --git a/cloud-servicechain/cloud-servicechain-impl/pom.xml b/cloud-servicechain/cloud-servicechain-impl/pom.xml new file mode 100644 index 0000000000..7eb4840999 --- /dev/null +++ b/cloud-servicechain/cloud-servicechain-impl/pom.xml @@ -0,0 +1,96 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + cloud-servicechain-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + javax.inject + javax.inject + + + org.opendaylight.controller + sal-binding-broker-impl + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + ${project.groupId} + cloud-servicechain-api + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + ${project.groupId} + fibmanager-api + ${project.version} + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + + org.opendaylight.infrautils + metrics-impl-test + ${infrautils.version} + test + + + org.opendaylight.infrautils + jobcoordinator-impl + ${infrautils.version} + test + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + + diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainConstants.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandler.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/RemoveVpnPseudoPortDataJob.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/VpnPseudoPortDataBaseJob.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/ElanDpnInterfacesListener.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnPseudoPortListener.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToDpnListener.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VpnToElanFallbackNodeListener.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/VrfListener.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java b/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java rename to cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml b/cloud-servicechain/cloud-servicechain-impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml rename to cloud-servicechain/cloud-servicechain-impl/src/main/resources/org/opendaylight/blueprint/cloud-servicechain.xml diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java b/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java rename to cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java b/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java rename to cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java b/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java rename to cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java b/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java rename to cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/resources/simplelogger.properties b/cloud-servicechain/cloud-servicechain-impl/src/test/resources/simplelogger.properties similarity index 100% rename from vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/resources/simplelogger.properties rename to cloud-servicechain/cloud-servicechain-impl/src/test/resources/simplelogger.properties diff --git a/cloud-servicechain/pom.xml b/cloud-servicechain/pom.xml new file mode 100644 index 0000000000..2e6ac26da3 --- /dev/null +++ b/cloud-servicechain/pom.xml @@ -0,0 +1,49 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + cloud-servicechain + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + cloud-servicechain-api + cloud-servicechain-impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/coe/api/pom.xml b/coe/api/pom.xml new file mode 100644 index 0000000000..f8ab3feb61 --- /dev/null +++ b/coe/api/pom.xml @@ -0,0 +1,34 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + coe-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.yangtools + yang-common + + + diff --git a/coe/impl/pom.xml b/coe/impl/pom.xml new file mode 100644 index 0000000000..ad0e434ecc --- /dev/null +++ b/coe/impl/pom.xml @@ -0,0 +1,80 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + coe-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + javax.inject + javax.inject + + + org.opendaylight.coe + coe-northbound-api + 0.3.0-SNAPSHOT + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.infrautils + jobcoordinator-api + ${infrautils.version} + + + ${project.groupId} + coe-api + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + org.eclipse.xtend + xtend-maven-plugin + + + + diff --git a/vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java similarity index 100% rename from vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java rename to coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java diff --git a/vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java similarity index 100% rename from vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java rename to coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/ServiceListener.java diff --git a/vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java similarity index 100% rename from vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java rename to coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java diff --git a/vpnservice/coe/impl/src/main/resources/org/opendaylight/blueprint/coe-renderer.xml b/coe/impl/src/main/resources/org/opendaylight/blueprint/coe-renderer.xml similarity index 100% rename from vpnservice/coe/impl/src/main/resources/org/opendaylight/blueprint/coe-renderer.xml rename to coe/impl/src/main/resources/org/opendaylight/blueprint/coe-renderer.xml diff --git a/coe/pom.xml b/coe/pom.xml new file mode 100644 index 0000000000..1a79407895 --- /dev/null +++ b/coe/pom.xml @@ -0,0 +1,50 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + 0.6.0-SNAPSHOT + coe + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + api + impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/vpnservice/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml similarity index 100% rename from vpnservice/commons/binding-parent/pom.xml rename to commons/binding-parent/pom.xml diff --git a/commons/pom.xml b/commons/pom.xml new file mode 100644 index 0000000000..513f70bea1 --- /dev/null +++ b/commons/pom.xml @@ -0,0 +1,49 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + commons + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + binding-parent + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/dhcpservice/dhcpservice-api/pom.xml b/dhcpservice/dhcpservice-api/pom.xml new file mode 100644 index 0000000000..4e3de41c8d --- /dev/null +++ b/dhcpservice/dhcpservice-api/pom.xml @@ -0,0 +1,39 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + dhcpservice-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + yang-ext + + + diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java b/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java rename to dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java b/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java rename to dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java b/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java rename to dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java b/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java rename to dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPUtils.java diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java b/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java rename to dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/yang/dhcp.yang b/dhcpservice/dhcpservice-api/src/main/yang/dhcp.yang similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-api/src/main/yang/dhcp.yang rename to dhcpservice/dhcpservice-api/src/main/yang/dhcp.yang diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/yang/dhcp_allocation_pool.yang b/dhcpservice/dhcpservice-api/src/main/yang/dhcp_allocation_pool.yang similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-api/src/main/yang/dhcp_allocation_pool.yang rename to dhcpservice/dhcpservice-api/src/main/yang/dhcp_allocation_pool.yang diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/yang/dhcpservice-api.yang b/dhcpservice/dhcpservice-api/src/main/yang/dhcpservice-api.yang similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-api/src/main/yang/dhcpservice-api.yang rename to dhcpservice/dhcpservice-api/src/main/yang/dhcpservice-api.yang diff --git a/dhcpservice/dhcpservice-impl/pom.xml b/dhcpservice/dhcpservice-impl/pom.xml new file mode 100644 index 0000000000..daa985e8fe --- /dev/null +++ b/dhcpservice/dhcpservice-impl/pom.xml @@ -0,0 +1,147 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + dhcpservice-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + javax.inject + javax.inject + + + commons-net + commons-net + + + org.apache.karaf.shell + org.apache.karaf.shell.console + provided + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.mdsal + mdsal-eos-binding-api + + + org.opendaylight.neutron + model + ${neutron.version} + + + org.opendaylight.genius + idmanager-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.genius + itm-api + ${genius.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + org.opendaylight.infrautils + counters-api + ${infrautils.version} + + + ${project.groupId} + dhcpservice-api + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + org.opendaylight.openflowplugin.model + model-flow-service + ${openflowplugin.version} + + + org.opendaylight.ovsdb + hwvtepsouthbound-api + ${ovsdb.version} + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/netvirt-dhcpservice-config.xml + + xml + config + + + + + + + + + diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolManager.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpConfigListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpDesignatedDpnListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceEventListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpMcastMacListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPortCache.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceCounters.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpUCastMacListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/NodeListener.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolAddJob.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpAllocationPoolRemoveJob.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java b/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java rename to dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml b/dhcpservice/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml rename to dhcpservice/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml b/dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml rename to dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice.xml diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/yang/dhcpservice-config.yang b/dhcpservice/dhcpservice-impl/src/main/yang/dhcpservice-config.yang similarity index 100% rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/yang/dhcpservice-config.yang rename to dhcpservice/dhcpservice-impl/src/main/yang/dhcpservice-config.yang diff --git a/dhcpservice/pom.xml b/dhcpservice/pom.xml new file mode 100644 index 0000000000..a0bd91bbfc --- /dev/null +++ b/dhcpservice/pom.xml @@ -0,0 +1,49 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + dhcpservice + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + dhcpservice-api + dhcpservice-impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/elanmanager/elanmanager-api/pom.xml b/elanmanager/elanmanager-api/pom.xml new file mode 100644 index 0000000000..76fc2ad412 --- /dev/null +++ b/elanmanager/elanmanager-api/pom.xml @@ -0,0 +1,60 @@ + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + elanmanager-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.controller.model + model-inventory + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-interfaces + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + yang-ext + + + org.opendaylight.genius + idmanager-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderConstant.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderInput.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/ElanHelper.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanBridgeManager.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java b/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java rename to elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/utils/ElanL2GwCacheUtils.java diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/yang/elan-statistics.yang b/elanmanager/elanmanager-api/src/main/yang/elan-statistics.yang similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/yang/elan-statistics.yang rename to elanmanager/elanmanager-api/src/main/yang/elan-statistics.yang diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/yang/elan.yang b/elanmanager/elanmanager-api/src/main/yang/elan.yang similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/yang/elan.yang rename to elanmanager/elanmanager-api/src/main/yang/elan.yang diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/yang/etree.yang b/elanmanager/elanmanager-api/src/main/yang/etree.yang similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/yang/etree.yang rename to elanmanager/elanmanager-api/src/main/yang/etree.yang diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/yang/scalein-rpc.yang b/elanmanager/elanmanager-api/src/main/yang/scalein-rpc.yang similarity index 100% rename from vpnservice/elanmanager/elanmanager-api/src/main/yang/scalein-rpc.yang rename to elanmanager/elanmanager-api/src/main/yang/scalein-rpc.yang diff --git a/elanmanager/elanmanager-impl/pom.xml b/elanmanager/elanmanager-impl/pom.xml new file mode 100644 index 0000000000..93b9c1e0c7 --- /dev/null +++ b/elanmanager/elanmanager-impl/pom.xml @@ -0,0 +1,250 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + elanmanager-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + ${project.groupId} + elanmanager-api + ${project.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.infrautils + diagstatus-api + ${infrautils.version} + + + org.ops4j.pax.cdi + pax-cdi-api + true + + + org.opendaylight.genius + itm-api + ${genius.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + org.opendaylight.controller + sal-binding-broker-impl + + + org.opendaylight.ovsdb + hwvtepsouthbound-api + ${ovsdb.version} + + + org.opendaylight.neutron + model + ${neutron.version} + + + org.apache.karaf.shell + org.apache.karaf.shell.console + provided + + + ${project.groupId} + dhcpservice-api + ${project.version} + + + org.opendaylight.ovsdb + southbound-api + ${ovsdb.version} + + + org.opendaylight.ovsdb + utils.mdsal-utils + ${ovsdb.version} + + + org.opendaylight.ovsdb + utils.southbound-utils + ${ovsdb.version} + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + org.opendaylight.openflowplugin + openflowplugin-extension-nicira + ${openflowplugin.version} + + + org.opendaylight.openflowplugin.model + model-flow-service + ${openflowplugin.version} + + + org.opendaylight.openflowplugin.model + model-flow-base + ${openflowplugin.version} + + + + + org.opendaylight.yangtools + testutils + test + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + test + test-jar + + + org.opendaylight.genius + mdsalutil-impl + ${genius.version} + test + + + org.opendaylight.controller + sal-binding-broker-impl + test + test-jar + + + org.opendaylight.mdsal + mdsal-binding-test-utils + test + + + org.opendaylight.genius + lockmanager-impl + ${genius.version} + test + + + org.opendaylight.genius + idmanager-impl + ${genius.version} + test + + + org.opendaylight.genius + interfacemanager-impl + ${genius.version} + test + + + org.opendaylight.infrautils + inject.guice.testutils + ${infrautils.version} + test + + + org.opendaylight.infrautils + infrautils-testutils + ${infrautils.version} + test + + + org.opendaylight.genius + mdsalutil-testutils + ${genius.version} + test + + + org.opendaylight.netvirt + neutronvpn-impl + ${project.version} + test + + + org.opendaylight.genius + testutils + ${genius.version} + test + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + true + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/netvirt-elanmanager-config.xml + + xml + config + + + + + + + + org.eclipse.xtend + xtend-maven-plugin + + + + + diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/ElanException.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceAdd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceUpdate.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableFlush.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanUpdate.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/ElanMacEntryListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/MacVrfEntryListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/ElanEvpnFlowUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfacesListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanExtnTepListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceManager.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateChangeListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanItmEventListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanManagerCounters.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanNodeListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanOvsdbNodeListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanSmacFlowEventListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElanInterface.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElan.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceRemoveWorkerOnElanInterface.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/BatchedTransaction.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/BaseCommand.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/IMergeCommand.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/MergeCommand.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteMcastCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/SwitchesCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TunnelIpCmd.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/INodeCopier.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeDisconnectedHandler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAListeners.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeDataListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalNodeMerger.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/MergeCommandsAggregator.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSAugmentationMerger.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/PSNodeMerger.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteL2GwDeviceMacsFromElanJob.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DeleteLogicalSwitchJob.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/HwvtepDeviceMcastMacUpdateJob.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/LogicalSwitchAddedJob.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ChildListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLocalUcastMacListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepLogicalSwitchListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepPhysicalSwitchListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/SettableFutureCallback.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statisitcs/ElanStatisticsImpl.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInstanceListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/CacheElanInterfaceListener.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanClusterUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/Scheduler.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java b/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java rename to elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml b/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml rename to elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml b/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml rename to elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/commands.xml diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml b/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml rename to elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang b/elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang rename to elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/DataProvider.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerTest.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.xtend diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/ElanEgressActionsHelper.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/IdHelper.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java rename to elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/InterfaceHelper.java diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java b/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java similarity index 100% rename from vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/VpnManagerTestImpl.java rename to elanmanager/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/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/.ExpectedObjects.java._trace new file mode 100644 index 0000000000000000000000000000000000000000..dea42bcafe27937a1c035d6a5e67645c15212454 GIT binary patch literal 4071 zcmZ|ReN0vN83*w5oO91T%H>|}<$^DOZ+B9VGA{xJ-J4t*k{#ICy`#Uc_xr=af$Z=L zeM7^+Y=8H_^W6j8z1gAQaCYnP)?oAYE!hpj*^TWzo5(p5a zw5(69nUA|3SwqoU*5ls!3mDY5Bman4c=`!CTbY0QHzNX3Ym2~@()c;Yhc@RIsKho6G<>hp)x0t|3 ziW+VxE-$B37OeJh_<@flAl%Wk@rjjm<|XsTtVIn^G`TAp>C_&xA3w%FkRBU3!xMpu z3Ocu^jATAm9N`JAqJm9vfbe92fP9vK@U(}+8y*H~Ev2c zO9epq;w%9=OF;OVhr>w^12q>Qe5YjDGFm$0!B6lLQhG;Qwv3hvfbidD3D8*r!e6=h z$W4Po#AQxa1!>7$+=`d+s^TD&ty)efl#gjf&WH=Ks*2GZB9|34Qah)riYyh%m(Wni z!CS}@5J}+pli#E>mGzW^`mfXHbV z2eLvE*sGJ&Z2F84s!3g0MVX&o{(G51&F?&1%vde<+VX{N5kXdi0<$T z@rs3a`-1eYLyAkl8-A9sZd#4z3Pg{a|Ey`GQ$6?#yh@&02ch?C8Yqq62qS0o`0AP( zCPf6UDr)q4QB4g!^@xOrTOF*ovgpW-57-+GsBA%F%i9sia51cHa#&Q5+ zW7ttwPuION7iY-c^w`*nx;hFsJPfqhK382G-N+3W12uNQ;P7XI0mP1|eB=vNzzMyc zomiAY>{OlrIdXm$2eFD8%K?bjmo_xeW%p|QYUAxb4)XGI0pi{HJYn6vO(6b5t&zU2 ztREiY+Z!GiM|`_ii1=0Gy9yfF(=s$$?B%s$o{-Oq8qXDopT_4`u@|#^mskej|@3tT(PrpmpWC6>Bj>io+iBMf?wcSS0KAk5APv`Nj#MHVmOyP56uhCoP2;RegD|+IbpID08 zmwrO`6iEE3P*BW~&qzy<2bHH{4ug?uCrEsu%M|%C;9Y+$mgFlCUF1VUboqEnP1pz$ z5AtMcP9E>-&}ab{ZBLqRU2*?6Fe2cnXr60&;L~ndsW$ zv542JNgF}(MJx47o`U3_YB_kMM0D-<=MW^{aZ5VkW+_Nj;@`0sH<7DI9E<(STx340 zI8zNev0iGw)d`W$RXagyjbEnD`dJE6ZAFr1JdCtd(y+)7T{eOgxiPWgO`d|(hJd8c z%S2b7$0A;@rfdYMZC2_&PeE$DS`2omC8Fyma`%!THR+bA0yj%RdWpFZ`*Ab5ims`) zt7fP9mSUuXI99rQdg!2*ZZl+R#t>aLf^^DCk?Wy@ zknRe|L2^C3YlFukUazKY1nEI5MXrZ;jaG`m@2LUNH9ps(xs24bjUfG|OQz<#MAxBe zN#!M?>!?46ApJYHq*^y0%rt%LE)L?$1>* cV~YC!iF{NI9LzVT%qf!EsnbD9Z|jWUzs_Bo*Z=?k literal 0 HcmV?d00001 diff --git a/elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java b/elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java new file mode 100644 index 0000000000..f3a59c3d96 --- /dev/null +++ b/elanmanager/elanmanager-impl/src/test/xtend-gen/org/opendaylight/netvirt/elanmanager/tests/ExpectedObjects.java @@ -0,0 +1,136 @@ +/** + * Copyright (c) 2016, 2017 Red Hat, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.netvirt.elanmanager.tests; + +import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; +import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo; +import org.opendaylight.genius.testutils.interfacemanager.TunnelInterfaceDetails; +import org.opendaylight.mdsal.binding.testutils.AssertDataObjects; +import org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlanBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefs; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId; + +/** + * Definitions of complex objects expected in tests. + * + * These were originally generated {@link AssertDataObjects#assertEqualBeans}. + */ +@SuppressWarnings("all") +public class ExpectedObjects { + public static String ELAN1 = "34701c04-1118-4c65-9425-78a80d49a211"; + + public static Long ELAN1_SEGMENT_ID = Long.valueOf(100L); + + public static Interface newInterfaceConfig(final String interfaceName, final String parentName) { + InterfaceBuilder _interfaceBuilder = new InterfaceBuilder(); + final Procedure1 _function = (InterfaceBuilder it) -> { + it.setDescription(interfaceName); + it.setName(interfaceName); + it.setType(L2vlan.class); + ParentRefsBuilder _parentRefsBuilder = new ParentRefsBuilder(); + final Procedure1 _function_1 = (ParentRefsBuilder it_1) -> { + it_1.setParentInterface(parentName); + }; + ParentRefs _doubleGreaterThan = XtendBuilderExtensions.operator_doubleGreaterThan(_parentRefsBuilder, _function_1); + it.addAugmentation(ParentRefs.class, _doubleGreaterThan); + IfL2vlanBuilder _ifL2vlanBuilder = new IfL2vlanBuilder(); + final Procedure1 _function_2 = (IfL2vlanBuilder it_1) -> { + it_1.setL2vlanMode(IfL2vlan.L2vlanMode.Trunk); + VlanId _vlanId = new VlanId(Integer.valueOf(0)); + it_1.setVlanId(_vlanId); + }; + IfL2vlan _doubleGreaterThan_1 = XtendBuilderExtensions.operator_doubleGreaterThan(_ifL2vlanBuilder, _function_2); + it.addAugmentation(IfL2vlan.class, _doubleGreaterThan_1); + }; + return XtendBuilderExtensions.operator_doubleGreaterThan(_interfaceBuilder, _function); + } + + public static Object createElanInstance() { + throw new Error("Unresolved compilation problems:" + + "\nElanInstancesBuilder cannot be resolved." + + "\nThe method elanInstance(List) is undefined" + + "\nElanInstanceBuilder cannot be resolved." + + "\nThe method description(String) is undefined" + + "\nThe method elanInstanceName(String) is undefined" + + "\nThe method elanTag(long) is undefined" + + "\nThe method macTimeout(long) is undefined" + + "\n>> cannot be resolved" + + "\n>> cannot be resolved"); + } + + public static Object createElanInstance(final String elan, final Long segmentId) { + throw new Error("Unresolved compilation problems:" + + "\nElanInstanceBuilder cannot be resolved." + + "\nThe method elanInstanceName(String) is undefined" + + "\nThe method description(String) is undefined" + + "\nThe method segmentType(Object) is undefined" + + "\nThe method or field SegmentTypeVxlan is undefined" + + "\nThe method segmentationId(Long) is undefined" + + "\nThe method macTimeout(long) is undefined" + + "\n>> cannot be resolved"); + } + + public static Object createElanInstance(final String elan, final Long segmentId, final Long tag) { + throw new Error("Unresolved compilation problems:" + + "\nElanInstanceBuilder cannot be resolved." + + "\nThe method elanInstanceName(String) is undefined" + + "\nThe method description(String) is undefined" + + "\nThe method elanTag(Long) is undefined" + + "\nThe method segmentationId(Long) is undefined" + + "\nThe method segmentType(Object) is undefined" + + "\nThe method or field SegmentTypeVxlan is undefined" + + "\nThe method macTimeout(long) is undefined" + + "\n>> cannot be resolved"); + } + + public static Flow checkSmac(final String flowId, final InterfaceInfo interfaceInfo, final /* ElanInstance */Object elanInstance) { + throw new Error("Unresolved compilation problems:" + + "\ngetElanTag cannot be resolved"); + } + + public static Flow checkDmacOfSameDpn(final String flowId, final InterfaceInfo interfaceInfo, final /* ElanInstance */Object elanInstance) { + throw new Error("Unresolved compilation problems:" + + "\ngetElanTag cannot be resolved"); + } + + public static Flow checkDmacOfOtherDPN(final String flowId, final InterfaceInfo interfaceInfo, final TunnelInterfaceDetails tepDetails, final /* ElanInstance */Object elanInstance) { + throw new Error("Unresolved compilation problems:" + + "\ngetElanTag cannot be resolved"); + } + + public static Object checkEvpnAdvertiseRoute(final Long vni, final String mac, final String tepip, final String prefix, final String rd1) { + throw new Error("Unresolved compilation problems:" + + "\nNetworksBuilder cannot be resolved." + + "\nThe method bgpControlPlaneType(Object) is undefined" + + "\nThe method or field BgpControlPlaneType is undefined" + + "\nThe method encapType(Object) is undefined" + + "\nThe method or field EncapType is undefined" + + "\nThe method ethtag(long) is undefined" + + "\nThe method l2vni(Long) is undefined" + + "\nThe method l3vni(long) is undefined" + + "\nThe method label(long) is undefined" + + "\nThe method macaddress(String) is undefined" + + "\nThe method nexthop(Ipv4Address) is undefined" + + "\nThe method prefixLen(String) is undefined" + + "\nThe method rd(String) is undefined" + + "\n>> cannot be resolved" + + "\nPROTOCOLEVPN cannot be resolved" + + "\nVXLAN cannot be resolved"); + } + + public static /* Networks */Object checkEvpnWithdrawRT2DelIntf() { + return null; + } +} diff --git a/elanmanager/pom.xml b/elanmanager/pom.xml new file mode 100644 index 0000000000..d26f6b3747 --- /dev/null +++ b/elanmanager/pom.xml @@ -0,0 +1,50 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + elanmanager + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + elanmanager-api + elanmanager-impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/vpnservice/features/netvirt-features/pom.xml b/features/netvirt-features/pom.xml similarity index 83% rename from vpnservice/features/netvirt-features/pom.xml rename to features/netvirt-features/pom.xml index 69f6ca9168..1b9e481d30 100644 --- a/vpnservice/features/netvirt-features/pom.xml +++ b/features/netvirt-features/pom.xml @@ -6,10 +6,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 org.opendaylight.odlparent @@ -23,6 +21,7 @@ 0.6.0-SNAPSHOT ODL :: netvirt :: ${project.artifactId} feature + 4.0.0 @@ -53,12 +52,5 @@ xml features - diff --git a/vpnservice/features/netvirt-sfc-features/pom.xml b/features/netvirt-sfc-features/pom.xml similarity index 91% rename from vpnservice/features/netvirt-sfc-features/pom.xml rename to features/netvirt-sfc-features/pom.xml index 3faff9a1cf..27c68a1c0a 100644 --- a/vpnservice/features/netvirt-sfc-features/pom.xml +++ b/features/netvirt-sfc-features/pom.xml @@ -6,10 +6,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 org.opendaylight.odlparent @@ -23,6 +21,7 @@ 0.6.0-SNAPSHOT ODL :: netvirt :: ${project.artifactId} feature + 4.0.0 diff --git a/vpnservice/features/odl-netvirt-api/pom.xml b/features/odl-netvirt-api/pom.xml similarity index 98% rename from vpnservice/features/odl-netvirt-api/pom.xml rename to features/odl-netvirt-api/pom.xml index 4ec4552754..26a6a1cd24 100644 --- a/vpnservice/features/odl-netvirt-api/pom.xml +++ b/features/odl-netvirt-api/pom.xml @@ -6,10 +6,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 org.opendaylight.odlparent @@ -21,9 +19,9 @@ org.opendaylight.netvirt odl-netvirt-api 0.6.0-SNAPSHOT - feature - OpenDaylight :: NetVirt :: api + feature + 4.0.0 @@ -33,6 +31,27 @@ xml features + + org.opendaylight.genius + odl-genius-api + 0.4.0-SNAPSHOT + xml + features + + + org.opendaylight.infrautils + odl-infrautils-counters + 1.3.0-SNAPSHOT + xml + features + + + org.opendaylight.infrautils + odl-infrautils-jobcoordinator + 1.3.0-SNAPSHOT + xml + features + org.opendaylight.mdsal.model odl-mdsal-models @@ -49,73 +68,52 @@ org.opendaylight.openflowplugin - odl-openflowplugin-nsf-model + odl-openflowplugin-libraries 0.6.0-SNAPSHOT xml features org.opendaylight.openflowplugin - odl-openflowplugin-nxm-extensions + odl-openflowplugin-nsf-model 0.6.0-SNAPSHOT xml features org.opendaylight.openflowplugin - odl-openflowplugin-libraries + odl-openflowplugin-nxm-extensions 0.6.0-SNAPSHOT xml features org.opendaylight.ovsdb - odl-ovsdb-southbound-api + odl-ovsdb-hwvtepsouthbound-api 1.6.0-SNAPSHOT xml features org.opendaylight.ovsdb - odl-ovsdb-hwvtepsouthbound-api + odl-ovsdb-southbound-api 1.6.0-SNAPSHOT xml features - - org.opendaylight.genius - odl-genius-api - 0.4.0-SNAPSHOT - xml - features - - - org.opendaylight.infrautils - odl-infrautils-counters - 1.3.0-SNAPSHOT - xml - features - - - org.opendaylight.infrautils - odl-infrautils-jobcoordinator - 1.3.0-SNAPSHOT - xml - features - ${project.groupId} - vpnmanager-api + aclservice-api ${project.version} ${project.groupId} - fibmanager-api + cloud-servicechain-api ${project.version} ${project.groupId} - neutronvpn-api + coe-api ${project.version} @@ -125,12 +123,12 @@ ${project.groupId} - natservice-api + elanmanager-api ${project.version} ${project.groupId} - aclservice-api + fibmanager-api ${project.version} @@ -140,22 +138,22 @@ ${project.groupId} - elanmanager-api + natservice-api ${project.version} ${project.groupId} - statistics-api + neutronvpn-api ${project.version} ${project.groupId} - cloud-servicechain-api + statistics-api ${project.version} ${project.groupId} - coe-api + vpnmanager-api ${project.version} diff --git a/vpnservice/features/odl-netvirt-coe/pom.xml b/features/odl-netvirt-coe/pom.xml similarity index 93% rename from vpnservice/features/odl-netvirt-coe/pom.xml rename to features/odl-netvirt-coe/pom.xml index 5f777304e4..e2bf77c830 100644 --- a/vpnservice/features/odl-netvirt-coe/pom.xml +++ b/features/odl-netvirt-coe/pom.xml @@ -6,10 +6,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 org.opendaylight.odlparent @@ -20,9 +18,10 @@ org.opendaylight.netvirt odl-netvirt-coe - OpenDaylight :: NetVirt :: Coe 0.6.0-SNAPSHOT + OpenDaylight :: NetVirt :: Coe feature + 4.0.0 diff --git a/vpnservice/features/odl-netvirt-impl/pom.xml b/features/odl-netvirt-impl/pom.xml similarity index 97% rename from vpnservice/features/odl-netvirt-impl/pom.xml rename to features/odl-netvirt-impl/pom.xml index 38540ba559..c89f5fb3dd 100644 --- a/vpnservice/features/odl-netvirt-impl/pom.xml +++ b/features/odl-netvirt-impl/pom.xml @@ -6,10 +6,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 org.opendaylight.odlparent @@ -21,9 +19,9 @@ org.opendaylight.netvirt odl-netvirt-impl 0.6.0-SNAPSHOT - feature - OpenDaylight :: NetVirt :: impl + feature + 4.0.0 @@ -34,37 +32,37 @@ features - org.opendaylight.neutron - odl-neutron-spi - 0.10.0-SNAPSHOT + org.opendaylight.genius + odl-genius + 0.4.0-SNAPSHOT xml features - org.opendaylight.ovsdb - odl-ovsdb-southbound-impl - 1.6.0-SNAPSHOT + org.opendaylight.infrautils + odl-infrautils-inject + 1.3.0-SNAPSHOT xml features - org.opendaylight.ovsdb - odl-ovsdb-hwvtepsouthbound - 1.6.0-SNAPSHOT + org.opendaylight.infrautils + odl-infrautils-diagstatus + 1.3.0-SNAPSHOT xml features - org.opendaylight.ovsdb - odl-ovsdb-utils - 1.6.0-SNAPSHOT + ${project.groupId} + odl-netvirt-api + ${project.version} xml features - ${project.groupId} - odl-netvirt-api - ${project.version} + org.opendaylight.neutron + odl-neutron-spi + 0.10.0-SNAPSHOT xml features @@ -83,76 +81,76 @@ features - org.opendaylight.genius - odl-genius - 0.4.0-SNAPSHOT + org.opendaylight.ovsdb + odl-ovsdb-southbound-impl + 1.6.0-SNAPSHOT xml features - org.opendaylight.infrautils - odl-infrautils-inject - 1.3.0-SNAPSHOT + org.opendaylight.ovsdb + odl-ovsdb-hwvtepsouthbound + 1.6.0-SNAPSHOT xml features - org.opendaylight.infrautils - odl-infrautils-diagstatus - 1.3.0-SNAPSHOT + org.opendaylight.ovsdb + odl-ovsdb-utils + 1.6.0-SNAPSHOT xml features ${project.groupId} - bgpmanager-impl + aclservice-impl ${project.version} - - - - org.apache.thrift - libthrift - - ${project.groupId} - vpnmanager-impl + aclservice-shell ${project.version} ${project.groupId} - vpnmanager-shell + bgpmanager-impl ${project.version} + + + + org.apache.thrift + libthrift + + ${project.groupId} - fibmanager-impl + cache-impl ${project.version} ${project.groupId} - fibmanager-shell + cloud-servicechain-impl ${project.version} ${project.groupId} - neutronvpn-impl + coe-impl ${project.version} ${project.groupId} - neutronvpn-shell + dhcpservice-impl ${project.version} ${project.groupId} - dhcpservice-impl + fibmanager-impl ${project.version} ${project.groupId} - cloud-servicechain-impl + fibmanager-shell ${project.version} @@ -167,12 +165,12 @@ ${project.groupId} - aclservice-impl + neutronvpn-impl ${project.version} ${project.groupId} - aclservice-shell + neutronvpn-shell ${project.version} @@ -180,11 +178,6 @@ qosservice-impl ${project.version} - ${project.groupId} ipv6service-impl @@ -207,12 +200,12 @@ ${project.groupId} - coe-impl + vpnmanager-impl ${project.version} ${project.groupId} - cache-impl + vpnmanager-shell ${project.version} diff --git a/vpnservice/features/odl-netvirt-impl/src/main/feature/feature.xml b/features/odl-netvirt-impl/src/main/feature/feature.xml similarity index 100% rename from vpnservice/features/odl-netvirt-impl/src/main/feature/feature.xml rename to features/odl-netvirt-impl/src/main/feature/feature.xml diff --git a/vpnservice/features/odl-netvirt-openstack/pom.xml b/features/odl-netvirt-openstack/pom.xml similarity index 93% rename from vpnservice/features/odl-netvirt-openstack/pom.xml rename to features/odl-netvirt-openstack/pom.xml index 01c6b09afd..1653173b6a 100644 --- a/vpnservice/features/odl-netvirt-openstack/pom.xml +++ b/features/odl-netvirt-openstack/pom.xml @@ -6,10 +6,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 org.opendaylight.odlparent @@ -21,22 +19,22 @@ org.opendaylight.netvirt odl-netvirt-openstack 0.6.0-SNAPSHOT - feature - OpenDaylight :: NetVirt :: OpenStack + feature + 4.0.0 - org.opendaylight.neutron - odl-neutron-service - 0.10.0-SNAPSHOT + ${project.groupId} + odl-netvirt-impl + ${project.version} xml features - ${project.groupId} - odl-netvirt-impl - ${project.version} + org.opendaylight.neutron + odl-neutron-service + 0.10.0-SNAPSHOT xml features diff --git a/vpnservice/features/odl-netvirt-sfc/pom.xml b/features/odl-netvirt-sfc/pom.xml similarity index 94% rename from vpnservice/features/odl-netvirt-sfc/pom.xml rename to features/odl-netvirt-sfc/pom.xml index 35ac5d06b3..0faba02625 100644 --- a/vpnservice/features/odl-netvirt-sfc/pom.xml +++ b/features/odl-netvirt-sfc/pom.xml @@ -6,10 +6,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 org.opendaylight.odlparent @@ -21,15 +19,15 @@ org.opendaylight.netvirt odl-netvirt-sfc 0.6.0-SNAPSHOT - feature - OpenDaylight :: NetVirt :: SFC + feature + 4.0.0 - org.opendaylight.sfc - odl-sfc-openflow-renderer - 0.7.0-SNAPSHOT + ${project.groupId} + odl-netvirt-openstack + ${project.version} xml features @@ -41,9 +39,9 @@ features - ${project.groupId} - odl-netvirt-openstack - ${project.version} + org.opendaylight.sfc + odl-sfc-openflow-renderer + 0.7.0-SNAPSHOT xml features diff --git a/vpnservice/features/odl-netvirt-ui/pom.xml b/features/odl-netvirt-ui/pom.xml similarity index 92% rename from vpnservice/features/odl-netvirt-ui/pom.xml rename to features/odl-netvirt-ui/pom.xml index 220dff1130..be5b0e2b9d 100644 --- a/vpnservice/features/odl-netvirt-ui/pom.xml +++ b/features/odl-netvirt-ui/pom.xml @@ -6,10 +6,8 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 org.opendaylight.odlparent @@ -21,9 +19,9 @@ org.opendaylight.netvirt odl-netvirt-ui 0.6.0-SNAPSHOT - feature - OpenDaylight :: NetVirt :: DLUX Integration Plugin + feature + 4.0.0 diff --git a/vpnservice/features/pom.xml b/features/pom.xml similarity index 87% rename from vpnservice/features/pom.xml rename to features/pom.xml index a30760993e..57f1e57676 100644 --- a/vpnservice/features/pom.xml +++ b/features/pom.xml @@ -6,20 +6,22 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 + + org.opendaylight.odlparent odlparent-lite 3.0.2 + org.opendaylight.netvirt features 0.6.0-SNAPSHOT - pom - ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 netvirt-features @@ -27,7 +29,6 @@ odl-netvirt-coe odl-netvirt-impl odl-netvirt-openstack - diff --git a/fibmanager/fibmanager-api/pom.xml b/fibmanager/fibmanager-api/pom.xml new file mode 100644 index 0000000000..04cdeb9192 --- /dev/null +++ b/fibmanager/fibmanager-api/pom.xml @@ -0,0 +1,64 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + fibmanager-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.controller.model + model-inventory + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + iana-if-type-2014-05-08 + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-interfaces + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.genius + itm-api + ${genius.version} + + + org.opendaylight.openflowplugin.model + model-flow-base + ${openflowplugin.version} + + + org.opendaylight.yangtools + yang-common + + + diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java b/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java rename to fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java b/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java rename to fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java b/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java rename to fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/L3VPNTransportTypes.java diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java b/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java rename to fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/RouteOrigin.java diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/yang/fib-rpc.yang b/fibmanager/fibmanager-api/src/main/yang/fib-rpc.yang similarity index 100% rename from vpnservice/fibmanager/fibmanager-api/src/main/yang/fib-rpc.yang rename to fibmanager/fibmanager-api/src/main/yang/fib-rpc.yang diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/yang/l3nexthop.yang b/fibmanager/fibmanager-api/src/main/yang/l3nexthop.yang similarity index 100% rename from vpnservice/fibmanager/fibmanager-api/src/main/yang/l3nexthop.yang rename to fibmanager/fibmanager-api/src/main/yang/l3nexthop.yang diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/yang/odl-fib.yang b/fibmanager/fibmanager-api/src/main/yang/odl-fib.yang similarity index 100% rename from vpnservice/fibmanager/fibmanager-api/src/main/yang/odl-fib.yang rename to fibmanager/fibmanager-api/src/main/yang/odl-fib.yang diff --git a/fibmanager/fibmanager-impl/pom.xml b/fibmanager/fibmanager-impl/pom.xml new file mode 100644 index 0000000000..ff851f0245 --- /dev/null +++ b/fibmanager/fibmanager-impl/pom.xml @@ -0,0 +1,92 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + fibmanager-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + javax.inject + javax.inject + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + ${project.groupId} + bgpmanager-api + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + ${project.groupId} + fibmanager-api + ${project.version} + + + org.opendaylight.genius + idmanager-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + org.opendaylight.openflowplugin.model + model-flow-service + ${openflowplugin.version} + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + + diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibConstants.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibRpcServiceImpl.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IPv6Handler.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/IVrfEntryHandler.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java rename to fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml b/fibmanager/fibmanager-impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml rename to fibmanager/fibmanager-impl/src/main/resources/org/opendaylight/blueprint/fibmanager.xml diff --git a/vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java b/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java rename to fibmanager/fibmanager-impl/src/test/java/org/opendaylight/netvirt/fibmanager/test/FibManagerTest.java diff --git a/fibmanager/fibmanager-shell/pom.xml b/fibmanager/fibmanager-shell/pom.xml new file mode 100644 index 0000000000..7a1a322b46 --- /dev/null +++ b/fibmanager/fibmanager-shell/pom.xml @@ -0,0 +1,41 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + fibmanager-shell + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.apache.karaf.shell + org.apache.karaf.shell.console + provided + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + ${project.groupId} + fibmanager-api + ${project.version} + + + diff --git a/vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java b/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java rename to fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ConfTransportL3VPNCommand.java diff --git a/vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java b/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java rename to fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java diff --git a/vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java b/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java similarity index 100% rename from vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java rename to fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowTransportTypeCommand.java diff --git a/vpnservice/fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml similarity index 100% rename from vpnservice/fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml rename to fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml diff --git a/fibmanager/pom.xml b/fibmanager/pom.xml new file mode 100644 index 0000000000..4387ae4780 --- /dev/null +++ b/fibmanager/pom.xml @@ -0,0 +1,50 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + fibmanager + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + fibmanager-api + fibmanager-impl + fibmanager-shell + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/ipv6service/api/pom.xml b/ipv6service/api/pom.xml new file mode 100644 index 0000000000..509e40d316 --- /dev/null +++ b/ipv6service/api/pom.xml @@ -0,0 +1,38 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + ipv6service-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-interfaces + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + diff --git a/vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/ElementCache.java b/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/ElementCache.java similarity index 100% rename from vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/ElementCache.java rename to ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/ElementCache.java diff --git a/vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualNetwork.java b/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualNetwork.java similarity index 100% rename from vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualNetwork.java rename to ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualNetwork.java diff --git a/vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualPort.java b/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualPort.java similarity index 100% rename from vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualPort.java rename to ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualPort.java diff --git a/vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualRouter.java b/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualRouter.java similarity index 100% rename from vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualRouter.java rename to ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualRouter.java diff --git a/vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualSubnet.java b/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualSubnet.java similarity index 100% rename from vpnservice/ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualSubnet.java rename to ipv6service/api/src/main/java/org/opendaylight/netvirt/ipv6service/api/IVirtualSubnet.java diff --git a/vpnservice/ipv6service/api/src/main/yang/ipv6-ndutil.yang b/ipv6service/api/src/main/yang/ipv6-ndutil.yang similarity index 100% rename from vpnservice/ipv6service/api/src/main/yang/ipv6-ndutil.yang rename to ipv6service/api/src/main/yang/ipv6-ndutil.yang diff --git a/vpnservice/ipv6service/api/src/main/yang/neighbor-discovery.yang b/ipv6service/api/src/main/yang/neighbor-discovery.yang similarity index 100% rename from vpnservice/ipv6service/api/src/main/yang/neighbor-discovery.yang rename to ipv6service/api/src/main/yang/neighbor-discovery.yang diff --git a/ipv6service/impl/pom.xml b/ipv6service/impl/pom.xml new file mode 100644 index 0000000000..4325ac9155 --- /dev/null +++ b/ipv6service/impl/pom.xml @@ -0,0 +1,118 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + ipv6service-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + javax.inject + javax.inject + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + ${project.groupId} + ipv6service-api + ${project.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + org.opendaylight.neutron + model + ${neutron.version} + + + org.opendaylight.openflowplugin.model + model-flow-service + ${openflowplugin.version} + + + org.opendaylight.openflowplugin + openflowplugin-api + ${openflowplugin.version} + + + org.opendaylight.ovsdb + southbound-api + ${ovsdb.version} + + + org.opendaylight.yangtools + yang-common + + + org.powermock + powermock-api-mockito + + + org.powermock + powermock-module-junit4 + + + org.slf4j + slf4j-simple + test + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + + diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NdUtilServiceImpl.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NdUtilServiceImpl.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NdUtilServiceImpl.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NdUtilServiceImpl.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitation.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitation.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitation.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitation.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6NodeListener.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandler.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandler.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandler.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandler.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6RouterAdvt.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceEosHandler.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceEosHandler.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceEosHandler.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceEosHandler.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceInterfaceEventListener.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceInterfaceEventListener.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceInterfaceEventListener.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/Ipv6ServiceInterfaceEventListener.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronNetworkChangeListener.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronNetworkChangeListener.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronNetworkChangeListener.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronNetworkChangeListener.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronPortChangeListener.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronRouterChangeListener.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronSubnetChangeListener.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronSubnetChangeListener.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronSubnetChangeListener.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/NeutronSubnetChangeListener.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualNetwork.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTimer.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTimer.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTimer.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTimer.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTrQueue.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTrQueue.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTrQueue.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6PeriodicTrQueue.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6TimerWheel.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6TimerWheel.java similarity index 100% rename from vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6TimerWheel.java rename to ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6TimerWheel.java diff --git a/vpnservice/ipv6service/impl/src/main/resources/org/opendaylight/blueprint/ipv6service.xml b/ipv6service/impl/src/main/resources/org/opendaylight/blueprint/ipv6service.xml similarity index 100% rename from vpnservice/ipv6service/impl/src/main/resources/org/opendaylight/blueprint/ipv6service.xml rename to ipv6service/impl/src/main/resources/org/opendaylight/blueprint/ipv6service.xml diff --git a/vpnservice/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitationTest.java b/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitationTest.java similarity index 100% rename from vpnservice/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitationTest.java rename to ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6NeighborSolicitationTest.java diff --git a/vpnservice/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandlerTest.java b/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandlerTest.java similarity index 100% rename from vpnservice/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandlerTest.java rename to ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6PktHandlerTest.java diff --git a/vpnservice/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6TestUtils.java b/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6TestUtils.java similarity index 100% rename from vpnservice/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6TestUtils.java rename to ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/Ipv6TestUtils.java diff --git a/vpnservice/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtilsTest.java b/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtilsTest.java similarity index 100% rename from vpnservice/ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtilsTest.java rename to ipv6service/impl/src/test/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtilsTest.java diff --git a/ipv6service/pom.xml b/ipv6service/pom.xml new file mode 100644 index 0000000000..9a37a0a4d5 --- /dev/null +++ b/ipv6service/pom.xml @@ -0,0 +1,51 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + ipv6service + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + api + impl + shell + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/ipv6service/shell/pom.xml b/ipv6service/shell/pom.xml new file mode 100644 index 0000000000..a378b6ddfa --- /dev/null +++ b/ipv6service/shell/pom.xml @@ -0,0 +1,46 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + ipv6service-shell + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.apache.karaf.shell + org.apache.karaf.shell.console + provided + + + org.opendaylight.infrautils + infrautils-util + 1.3.0-SNAPSHOT + + + ${project.groupId} + ipv6service-api + ${project.version} + + + org.osgi + org.osgi.core + provided + + + diff --git a/vpnservice/ipv6service/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java b/ipv6service/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java similarity index 100% rename from vpnservice/ipv6service/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java rename to ipv6service/shell/src/main/java/org/opendaylight/netvirt/ipv6service/shell/ShowIpv6Command.java diff --git a/vpnservice/ipv6service/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/ipv6service/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml similarity index 100% rename from vpnservice/ipv6service/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml rename to ipv6service/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml diff --git a/karaf/pom.xml b/karaf/pom.xml new file mode 100644 index 0000000000..ac6fbf88c5 --- /dev/null +++ b/karaf/pom.xml @@ -0,0 +1,131 @@ + + + + + + org.opendaylight.odlparent + karaf4-parent + 3.0.2 + + + + org.opendaylight.netvirt + karaf + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + 4.0.0 + + + + + + + + + org.apache.karaf.features + framework + ${karaf.version} + kar + compile + + + + ${project.groupId} + netvirt-features + ${project.version} + features + xml + runtime + + + + + org.opendaylight.controller + features-mdsal-trace + 1.7.0-SNAPSHOT + features + xml + runtime + + + + + org.opendaylight.controller + features-extras + 1.10.0-SNAPSHOT + xml + features + runtime + + + + + org.opendaylight.aaa + aaa-cli-jar + 0.7.0-SNAPSHOT + + test + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-aaa-cli-jar + prepare-package + + copy + + + + + org.opendaylight.aaa + aaa-cli-jar + 0.7.0-SNAPSHOT + + + ${project.build.directory}/assembly/bin + aaa-cli-jar + true + true + true + true + + true + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + false + + + + + diff --git a/model-bgp/pom.xml b/model-bgp/pom.xml new file mode 100644 index 0000000000..81aee05a87 --- /dev/null +++ b/model-bgp/pom.xml @@ -0,0 +1,46 @@ + + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../commons/binding-parent + + + model-bgp + 2013.07.15.12.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.yangtools + yang-common + + + + diff --git a/vpnservice/model-bgp/src/main/yang/bgp.yang b/model-bgp/src/main/yang/bgp.yang similarity index 100% rename from vpnservice/model-bgp/src/main/yang/bgp.yang rename to model-bgp/src/main/yang/bgp.yang diff --git a/vpnservice/model-bgp/src/main/yang/ebgp.yang b/model-bgp/src/main/yang/ebgp.yang similarity index 100% rename from vpnservice/model-bgp/src/main/yang/ebgp.yang rename to model-bgp/src/main/yang/ebgp.yang diff --git a/natservice/natservice-api/pom.xml b/natservice/natservice-api/pom.xml new file mode 100644 index 0000000000..ffc018889e --- /dev/null +++ b/natservice/natservice-api/pom.xml @@ -0,0 +1,42 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + natservice-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.yangtools + yang-common + + + diff --git a/vpnservice/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java b/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java similarity index 100% rename from vpnservice/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java rename to natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/CentralizedSwitchScheduler.java diff --git a/vpnservice/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java b/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java similarity index 100% rename from vpnservice/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java rename to natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceListener.java diff --git a/vpnservice/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java b/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java similarity index 100% rename from vpnservice/natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java rename to natservice/natservice-api/src/main/java/org/opendaylight/netvirt/natservice/api/SnatServiceManager.java diff --git a/vpnservice/natservice/natservice-api/src/main/yang/odl-nat-rpc.yang b/natservice/natservice-api/src/main/yang/odl-nat-rpc.yang similarity index 100% rename from vpnservice/natservice/natservice-api/src/main/yang/odl-nat-rpc.yang rename to natservice/natservice-api/src/main/yang/odl-nat-rpc.yang diff --git a/vpnservice/natservice/natservice-api/src/main/yang/odl-nat.yang b/natservice/natservice-api/src/main/yang/odl-nat.yang similarity index 100% rename from vpnservice/natservice/natservice-api/src/main/yang/odl-nat.yang rename to natservice/natservice-api/src/main/yang/odl-nat.yang diff --git a/natservice/natservice-impl/pom.xml b/natservice/natservice-impl/pom.xml new file mode 100644 index 0000000000..5b547bfb19 --- /dev/null +++ b/natservice/natservice-impl/pom.xml @@ -0,0 +1,158 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + natservice-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + commons-net + commons-net + + + javax.inject + javax.inject + + + org.opendaylight.controller + sal-binding-broker-impl + + + org.opendaylight.genius + arputil-api + ${genius.version} + + + org.opendaylight.genius + idmanager-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.genius + itm-api + ${genius.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + org.opendaylight.infrautils + counters-api + ${infrautils.version} + + + ${project.groupId} + bgpmanager-api + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + ${project.groupId} + fibmanager-api + ${project.version} + + + ${project.groupId} + natservice-api + ${project.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + org.opendaylight.openflowplugin.model + model-flow-service + ${openflowplugin.version} + + + org.powermock + powermock-api-mockito + test + + + org.powermock + powermock-module-junit4 + test + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/netvirt-natservice-config.xml + + xml + config + + + + + + + + + diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/NatDataUtil.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatCentralizedSwitchChangeListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/ha/WeightedCentralizedSwitchScheduler.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EventDispatcher.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnNaptSwitchHA.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnSnatFlowProgrammer.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworkGroupInstaller.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FlatVlanConntrackBasedSnatService.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPHandler.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/IPAddress.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/InterfaceStateEventListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTEntryEvent.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NAPTSwitchSelector.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptFlowRemovedEventHandler.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptPacketInHandler.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatConstants.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatInterfaceStateChangeListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceCounters.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterToVpnListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SNATDefaultRouteProgrammer.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SessionAddress.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceImplFactory.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SnatServiceManagerImpl.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetGwMacChangeListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/UpgradeStateListener.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VxlanGreConntrackBasedSnatService.java diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java b/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java rename to natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java diff --git a/vpnservice/natservice/natservice-impl/src/main/resources/initial/netvirt-natservice-config.xml b/natservice/natservice-impl/src/main/resources/initial/netvirt-natservice-config.xml similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/resources/initial/netvirt-natservice-config.xml rename to natservice/natservice-impl/src/main/resources/initial/netvirt-natservice-config.xml diff --git a/vpnservice/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/commands.xml b/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/commands.xml similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/commands.xml rename to natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/commands.xml diff --git a/vpnservice/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml b/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml rename to natservice/natservice-impl/src/main/resources/org/opendaylight/blueprint/natservice.xml diff --git a/vpnservice/natservice/natservice-impl/src/main/yang/natservice-config.yang b/natservice/natservice-impl/src/main/yang/natservice-config.yang similarity index 100% rename from vpnservice/natservice/natservice-impl/src/main/yang/natservice-config.yang rename to natservice/natservice-impl/src/main/yang/natservice-config.yang diff --git a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java b/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java rename to natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatServiceTest.java diff --git a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java b/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java rename to natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java diff --git a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java b/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java rename to natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java diff --git a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java b/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java similarity index 100% rename from vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java rename to natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NatUtilTest.java diff --git a/natservice/pom.xml b/natservice/pom.xml new file mode 100644 index 0000000000..0994cac888 --- /dev/null +++ b/natservice/pom.xml @@ -0,0 +1,49 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + natservice + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + natservice-api + natservice-impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/vpnservice/neutronvpn/neutronvpn-api/pom.xml b/neutronvpn/neutronvpn-api/pom.xml similarity index 99% rename from vpnservice/neutronvpn/neutronvpn-api/pom.xml rename to neutronvpn/neutronvpn-api/pom.xml index 31bf0cd53b..0d2fbc0591 100644 --- a/vpnservice/neutronvpn/neutronvpn-api/pom.xml +++ b/neutronvpn/neutronvpn-api/pom.xml @@ -8,6 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> + org.opendaylight.netvirt binding-parent @@ -15,37 +16,37 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ../../commons/binding-parent - 4.0.0 neutronvpn-api ODL :: netvirt :: ${project.artifactId} bundle + 4.0.0 - org.opendaylight.mdsal - yang-binding + org.opendaylight.controller + sal-binding-api - org.opendaylight.yangtools - yang-common + org.opendaylight.genius + mdsalutil-api + ${genius.version} - org.opendaylight.neutron - model - ${neutron.version} + org.opendaylight.mdsal + yang-binding org.opendaylight.mdsal.model ietf-yang-types-20130715 - org.opendaylight.genius - mdsalutil-api - ${genius.version} + org.opendaylight.neutron + model + ${neutron.version} - org.opendaylight.controller - sal-binding-api + org.opendaylight.yangtools + yang-common diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java b/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java rename to neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/enums/IpVersionChoice.java diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java b/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java rename to neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayCache.java diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java b/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java rename to neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/L2GatewayDevice.java diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java b/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java rename to neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java b/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java rename to neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java b/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java rename to neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java b/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java rename to neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/interfaces/INeutronVpnManager.java diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/yang/neutronvpn.yang b/neutronvpn/neutronvpn-api/src/main/yang/neutronvpn.yang similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-api/src/main/yang/neutronvpn.yang rename to neutronvpn/neutronvpn-api/src/main/yang/neutronvpn.yang diff --git a/neutronvpn/neutronvpn-impl/pom.xml b/neutronvpn/neutronvpn-impl/pom.xml new file mode 100644 index 0000000000..261d7ed925 --- /dev/null +++ b/neutronvpn/neutronvpn-impl/pom.xml @@ -0,0 +1,183 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + neutronvpn-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + com.google.code.gson + gson + + + javax.inject + javax.inject + + + org.opendaylight.genius + arputil-api + ${genius.version} + + + org.opendaylight.genius + idmanager-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.genius + itm-api + ${genius.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + ${project.groupId} + aclservice-api + ${project.version} + + + ${project.groupId} + alarm-impl + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + ${project.groupId} + natservice-api + ${project.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + org.opendaylight.ovsdb + hwvtepsouthbound-api + ${ovsdb.version} + + + org.opendaylight.ovsdb + southbound-api + ${ovsdb.version} + + + org.opendaylight.ovsdb + utils.mdsal-utils + ${ovsdb.version} + + + org.opendaylight.ovsdb + utils.southbound-utils + ${ovsdb.version} + + + org.opendaylight.neutron + model + ${neutron.version} + + + org.opendaylight.neutron + neutron-spi + ${neutron.version} + + + org.opendaylight.infrautils + caches-test + ${infrautils.version} + test + + + org.opendaylight.infrautils + jobcoordinator-impl + ${infrautils.version} + test + + + org.opendaylight.infrautils + metrics-impl-test + ${infrautils.version} + test + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/netvirt-neutronvpn-config.xml + + xml + config + + + + + + + + + + diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/HostConfigCache.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/IPV6InternetDefaultRouteProgrammer.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronBgpvpnChangeListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronExternalSubnetHandler.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronRouterChangeListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleConstants.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSecurityRuleListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetGwMacResolver.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronTrunkChangeListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManagerImpl.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/manager/NeutronEvpnManager.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/AddL2GwDevicesToTransportZoneJob.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java rename to neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GwTransportZoneListener.java diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/resources/initial/netvirt-neutronvpn-config.xml b/neutronvpn/neutronvpn-impl/src/main/resources/initial/netvirt-neutronvpn-config.xml similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/resources/initial/netvirt-neutronvpn-config.xml rename to neutronvpn/neutronvpn-impl/src/main/resources/initial/netvirt-neutronvpn-config.xml diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml b/neutronvpn/neutronvpn-impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml rename to neutronvpn/neutronvpn-impl/src/main/resources/org/opendaylight/blueprint/neutronvpn.xml diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/yang/neutronvpn-config.yang b/neutronvpn/neutronvpn-impl/src/main/yang/neutronvpn-config.yang similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/main/yang/neutronvpn-config.yang rename to neutronvpn/neutronvpn-impl/src/main/yang/neutronvpn-config.yang diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java b/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java rename to neutronvpn/neutronvpn-impl/src/test/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListenerTest.java diff --git a/vpnservice/neutronvpn/neutronvpn-shell/pom.xml b/neutronvpn/neutronvpn-shell/pom.xml similarity index 91% rename from vpnservice/neutronvpn/neutronvpn-shell/pom.xml rename to neutronvpn/neutronvpn-shell/pom.xml index 296f74e813..0eb99422e8 100644 --- a/vpnservice/neutronvpn/neutronvpn-shell/pom.xml +++ b/neutronvpn/neutronvpn-shell/pom.xml @@ -16,31 +16,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ../../commons/binding-parent - 4.0.0 neutronvpn-shell ODL :: netvirt :: ${project.artifactId} bundle + 4.0.0 + - ${project.groupId} - neutronvpn-api - ${project.version} + org.apache.karaf.shell + org.apache.karaf.shell.console + provided ${project.groupId} - vpnmanager-api + dhcpservice-api ${project.version} - ${project.groupId} - dhcpservice-api - ${project.version} + ${project.groupId} + neutronvpn-api + ${project.version} - org.apache.karaf.shell - org.apache.karaf.shell.console - provided + ${project.groupId} + vpnmanager-api + ${project.version} - diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java b/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java rename to neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java b/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java rename to neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpConfigureCommand.java diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java b/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java rename to neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/DhcpShowCommand.java diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java b/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java rename to neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowNeutronPortsCommand.java diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java b/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java rename to neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java b/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java rename to neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnConfigCommand.java diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java b/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java rename to neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowVpnIpToPort.java diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/neutronvpn/neutronvpn-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from vpnservice/neutronvpn/neutronvpn-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to neutronvpn/neutronvpn-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/neutronvpn/pom.xml b/neutronvpn/pom.xml new file mode 100644 index 0000000000..035a9b0de4 --- /dev/null +++ b/neutronvpn/pom.xml @@ -0,0 +1,51 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + neutronvpn + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + neutronvpn-api + neutronvpn-impl + neutronvpn-shell + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/vpnservice/ovsdb-ui/bundle/pom.xml b/ovsdb-ui/bundle/pom.xml similarity index 100% rename from vpnservice/ovsdb-ui/bundle/pom.xml rename to ovsdb-ui/bundle/pom.xml diff --git a/vpnservice/ovsdb-ui/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/ovsdb-ui/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from vpnservice/ovsdb-ui/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to ovsdb-ui/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/vpnservice/ovsdb-ui/module/pom.xml b/ovsdb-ui/module/pom.xml similarity index 100% rename from vpnservice/ovsdb-ui/module/pom.xml rename to ovsdb-ui/module/pom.xml diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/Graph.js b/ovsdb-ui/module/src/main/resources/ovsdb/Graph.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/Graph.js rename to ovsdb-ui/module/src/main/resources/ovsdb/Graph.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/LogicalGraph.js b/ovsdb-ui/module/src/main/resources/ovsdb/LogicalGraph.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/LogicalGraph.js rename to ovsdb-ui/module/src/main/resources/ovsdb/LogicalGraph.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/OvsCore.js b/ovsdb-ui/module/src/main/resources/ovsdb/OvsCore.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/OvsCore.js rename to ovsdb-ui/module/src/main/resources/ovsdb/OvsCore.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/assets/dhcp.png b/ovsdb-ui/module/src/main/resources/ovsdb/assets/dhcp.png similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/assets/dhcp.png rename to ovsdb-ui/module/src/main/resources/ovsdb/assets/dhcp.png diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/assets/router.png b/ovsdb-ui/module/src/main/resources/ovsdb/assets/router.png similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/assets/router.png rename to ovsdb-ui/module/src/main/resources/ovsdb/assets/router.png diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/assets/vm.png b/ovsdb-ui/module/src/main/resources/ovsdb/assets/vm.png similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/assets/vm.png rename to ovsdb-ui/module/src/main/resources/ovsdb/assets/vm.png diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/css/ovsdb.css b/ovsdb-ui/module/src/main/resources/ovsdb/css/ovsdb.css similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/css/ovsdb.css rename to ovsdb-ui/module/src/main/resources/ovsdb/css/ovsdb.css diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/css/select2.min.css b/ovsdb-ui/module/src/main/resources/ovsdb/css/select2.min.css similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/css/select2.min.css rename to ovsdb-ui/module/src/main/resources/ovsdb/css/select2.min.css diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/css/toggle-switch.css b/ovsdb-ui/module/src/main/resources/ovsdb/css/toggle-switch.css similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/css/toggle-switch.css rename to ovsdb-ui/module/src/main/resources/ovsdb/css/toggle-switch.css diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/lib/d3.min.js b/ovsdb-ui/module/src/main/resources/ovsdb/lib/d3.min.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/lib/d3.min.js rename to ovsdb-ui/module/src/main/resources/ovsdb/lib/d3.min.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/lib/select2.full.min.js b/ovsdb-ui/module/src/main/resources/ovsdb/lib/select2.full.min.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/lib/select2.full.min.js rename to ovsdb-ui/module/src/main/resources/ovsdb/lib/select2.full.min.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/lib/sylvester.js b/ovsdb-ui/module/src/main/resources/ovsdb/lib/sylvester.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/lib/sylvester.js rename to ovsdb-ui/module/src/main/resources/ovsdb/lib/sylvester.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/matrix.js b/ovsdb-ui/module/src/main/resources/ovsdb/matrix.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/matrix.js rename to ovsdb-ui/module/src/main/resources/ovsdb/matrix.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.constant.js b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.constant.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.constant.js rename to ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.constant.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.controller.js b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.controller.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.controller.js rename to ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.controller.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.directives.js b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.directives.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.directives.js rename to ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.directives.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.module.js b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.module.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.module.js rename to ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.module.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.services.js b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.services.js similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.services.js rename to ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.services.js diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/views/graph_header.tpl.html b/ovsdb-ui/module/src/main/resources/ovsdb/views/graph_header.tpl.html similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/views/graph_header.tpl.html rename to ovsdb-ui/module/src/main/resources/ovsdb/views/graph_header.tpl.html diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/views/index.tpl.html b/ovsdb-ui/module/src/main/resources/ovsdb/views/index.tpl.html similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/views/index.tpl.html rename to ovsdb-ui/module/src/main/resources/ovsdb/views/index.tpl.html diff --git a/vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/views/root.tpl.html b/ovsdb-ui/module/src/main/resources/ovsdb/views/root.tpl.html similarity index 100% rename from vpnservice/ovsdb-ui/module/src/main/resources/ovsdb/views/root.tpl.html rename to ovsdb-ui/module/src/main/resources/ovsdb/views/root.tpl.html diff --git a/ovsdb-ui/pom.xml b/ovsdb-ui/pom.xml new file mode 100644 index 0000000000..1982e35884 --- /dev/null +++ b/ovsdb-ui/pom.xml @@ -0,0 +1,50 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + ovsdb-ui + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + module + bundle + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/policyservice/api/pom.xml b/policyservice/api/pom.xml new file mode 100644 index 0000000000..51444c6641 --- /dev/null +++ b/policyservice/api/pom.xml @@ -0,0 +1,35 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + policyservice-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal.model + opendaylight-l2-types + + + ${project.groupId} + aclservice-api + ${project.version} + + + diff --git a/vpnservice/policyservice/api/src/main/yang/policy-service.yang b/policyservice/api/src/main/yang/policy-service.yang similarity index 100% rename from vpnservice/policyservice/api/src/main/yang/policy-service.yang rename to policyservice/api/src/main/yang/policy-service.yang diff --git a/policyservice/impl/pom.xml b/policyservice/impl/pom.xml new file mode 100644 index 0000000000..842385c78e --- /dev/null +++ b/policyservice/impl/pom.xml @@ -0,0 +1,101 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + policyservice-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + javax.inject + javax.inject + + + org.opendaylight.genius + idmanager-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.genius + itm-api + ${genius.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + ${project.groupId} + aclservice-api + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + ${project.groupId} + policyservice-api + ${project.version} + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + org.powermock + powermock-api-mockito + test + + + org.powermock + powermock-module-junit4 + test + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + + diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowWrapper.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowWrapper.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowWrapper.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowWrapper.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyIdManager.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyIdManager.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyIdManager.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyIdManager.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteFlowProgrammer.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyRouteGroupProgrammer.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyServiceConstants.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyServiceConstants.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyServiceConstants.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyServiceConstants.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyAceChangeListener.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyAceChangeListener.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyAceChangeListener.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyAceChangeListener.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyNodeListener.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyNodeListener.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyNodeListener.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyNodeListener.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyProfileChangeListener.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyProfileChangeListener.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyProfileChangeListener.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/PolicyProfileChangeListener.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelStateChangeListener.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelUnderlayNetworkChangeListener.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelUnderlayNetworkChangeListener.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelUnderlayNetworkChangeListener.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/TunnelUnderlayNetworkChangeListener.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceFlowUtil.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceFlowUtil.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceFlowUtil.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceFlowUtil.java diff --git a/vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java similarity index 100% rename from vpnservice/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java rename to policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java diff --git a/vpnservice/policyservice/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml b/policyservice/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml similarity index 100% rename from vpnservice/policyservice/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml rename to policyservice/impl/src/main/resources/org/opendaylight/blueprint/policyservice.xml diff --git a/policyservice/pom.xml b/policyservice/pom.xml new file mode 100644 index 0000000000..397f20abe0 --- /dev/null +++ b/policyservice/pom.xml @@ -0,0 +1,50 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + policyservice + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + api + impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/pom.xml b/pom.xml index f45fe17c1a..d23e106aef 100644 --- a/pom.xml +++ b/pom.xml @@ -6,101 +6,104 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + - org.opendaylight.netvirt - netvirt - 1.6.0-SNAPSHOT - ${project.artifactId} - pom - The OVSDB Plugin integration project is a project for OpenDaylight that will implement the Open vSwitch Database RFC 7047 management protocol allowing the Southbound configuration of vSwitches and a network virtualization implementation. - - - Eclipse Public License v1.0 - http://www.eclipse.org/legal/epl-v10.html - - - - - Sam Hague - shague@gmail.com - https://github.com/shague - - - - scm:git:ssh://git.opendaylight.org:29418/netvirt.git - scm:git:ssh://git.opendaylight.org:29418/netvirt.git - HEAD - https://wiki.opendaylight.org/view/OVSDB_Integration:Main - + org.opendaylight.netvirt + netvirt-aggregator + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 - - vpnservice - artifacts - + The NetVirt project is a project for OpenDaylight that implements a network virtualization + implementation. + + + + Eclipse Public License v1.0 + http://www.eclipse.org/legal/epl-v10.html + + + + + Sam Hague + shague@gmail.com + https://github.com/shague + + + + scm:git:ssh://git.opendaylight.org:29418/netvirt.git + scm:git:ssh://git.opendaylight.org:29418/netvirt.git + HEAD + https://wiki.opendaylight.org/view/OVSDB_Integration:Main + - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + + aclservice + alarm + artifacts + bgpmanager + cache + cloud-servicechain + coe + commons + dhcpservice + elanmanager + features + fibmanager + ipv6service + karaf + model-bgp + natservice + neutronvpn + qosservice + statemanager + statistics + vpnmanager + - - - - maven-site - - - ${user.dir}/deploy-site.xml - - + + + sfc + + true + + + sfc + sfc-artifacts + + + + + no-sfc + + - + + - - org.apache.maven.plugins - maven-javadoc-plugin - false - - - aggregate - - aggregate - - package - - - + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + - - - - + diff --git a/qosservice/api/pom.xml b/qosservice/api/pom.xml new file mode 100644 index 0000000000..1e52a20727 --- /dev/null +++ b/qosservice/api/pom.xml @@ -0,0 +1,37 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + qosservice-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + iana-if-type-2014-05-08 + + + org.opendaylight.mdsal.model + yang-ext + + + diff --git a/vpnservice/qosservice/api/src/main/yang/qos-alert-config.yang b/qosservice/api/src/main/yang/qos-alert-config.yang similarity index 100% rename from vpnservice/qosservice/api/src/main/yang/qos-alert-config.yang rename to qosservice/api/src/main/yang/qos-alert-config.yang diff --git a/vpnservice/qosservice/impl/pom.xml b/qosservice/impl/pom.xml similarity index 53% rename from vpnservice/qosservice/impl/pom.xml rename to qosservice/impl/pom.xml index 9d83ceb534..2bfffd0ea3 100644 --- a/vpnservice/qosservice/impl/pom.xml +++ b/qosservice/impl/pom.xml @@ -6,7 +6,8 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + org.opendaylight.netvirt @@ -15,106 +16,106 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ../../commons/binding-parent - 4.0.0 qosservice-impl ODL :: netvirt :: ${project.artifactId} bundle + 4.0.0 + - + + org.apache.karaf.shell + org.apache.karaf.shell.console + provided + + + org.apache.felix + org.apache.felix.configadmin + 1.8.14 + + org.opendaylight.genius - mdsalutil-api + interfacemanager-api ${genius.version} org.opendaylight.genius - interfacemanager-api + mdsalutil-api ${genius.version} - org.opendaylight.ovsdb - utils.southbound-utils - ${ovsdb.version} + org.opendaylight.infrautils + inject + ${infrautils.version} ${project.groupId} neutronvpn-api ${project.version} - - com.google.truth - truth - test - ${project.groupId} qosservice-api ${project.version} - org.opendaylight.infrautils - inject - ${infrautils.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.console - provided + org.opendaylight.ovsdb + utils.southbound-utils + ${ovsdb.version} - org.apache.felix - org.apache.felix.configadmin - 1.8.14 + com.google.truth + truth + test - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/netvirt-qosservice-config.xml - xml - config - - - ${project.build.directory}/classes/initial/qosservice.cfg - cfg - config - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/netvirt-qosservice-config.xml + + xml + config + + + ${project.build.directory}/classes/initial/qosservice.cfg + cfg + config + + + + + + + - diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertConfigListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertConfigListener.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertConfigListener.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertConfigListener.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertEnableCLI.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertGenerator.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertGenerator.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertGenerator.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertGenerator.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPollIntervalCLI.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPortData.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPortData.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPortData.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertPortData.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertThresholdCLI.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosConstants.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosConstants.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosConstants.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosConstants.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosEosHandler.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosEosHandler.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosEosHandler.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosEosHandler.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNodeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNodeListener.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNodeListener.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNodeListener.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosPolicyChangeListener.java diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/UuidUtil.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/UuidUtil.java similarity index 100% rename from vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/UuidUtil.java rename to qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/UuidUtil.java diff --git a/vpnservice/qosservice/impl/src/main/resources/initial/netvirt-qosservice-config.xml b/qosservice/impl/src/main/resources/initial/netvirt-qosservice-config.xml similarity index 100% rename from vpnservice/qosservice/impl/src/main/resources/initial/netvirt-qosservice-config.xml rename to qosservice/impl/src/main/resources/initial/netvirt-qosservice-config.xml diff --git a/vpnservice/qosservice/impl/src/main/resources/initial/qosservice.cfg b/qosservice/impl/src/main/resources/initial/qosservice.cfg similarity index 100% rename from vpnservice/qosservice/impl/src/main/resources/initial/qosservice.cfg rename to qosservice/impl/src/main/resources/initial/qosservice.cfg diff --git a/vpnservice/qosservice/impl/src/main/resources/org/opendaylight/blueprint/qosservice.xml b/qosservice/impl/src/main/resources/org/opendaylight/blueprint/qosservice.xml similarity index 100% rename from vpnservice/qosservice/impl/src/main/resources/org/opendaylight/blueprint/qosservice.xml rename to qosservice/impl/src/main/resources/org/opendaylight/blueprint/qosservice.xml diff --git a/vpnservice/qosservice/impl/src/test/java/org/opendaylight/netvirt/qosservice/UuidUtilTest.java b/qosservice/impl/src/test/java/org/opendaylight/netvirt/qosservice/UuidUtilTest.java similarity index 100% rename from vpnservice/qosservice/impl/src/test/java/org/opendaylight/netvirt/qosservice/UuidUtilTest.java rename to qosservice/impl/src/test/java/org/opendaylight/netvirt/qosservice/UuidUtilTest.java diff --git a/vpnservice/qosservice/pom.xml b/qosservice/pom.xml similarity index 99% rename from vpnservice/qosservice/pom.xml rename to qosservice/pom.xml index a5d64dc77a..7d7c63b5c3 100644 --- a/vpnservice/qosservice/pom.xml +++ b/qosservice/pom.xml @@ -21,10 +21,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ODL :: netvirt :: ${project.artifactId} pom 4.0.0 + api impl + @@ -44,5 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - diff --git a/vpnservice/sfc-artifacts/pom.xml b/sfc-artifacts/pom.xml similarity index 97% rename from vpnservice/sfc-artifacts/pom.xml rename to sfc-artifacts/pom.xml index 34c271e496..1ed9087ace 100644 --- a/vpnservice/sfc-artifacts/pom.xml +++ b/sfc-artifacts/pom.xml @@ -15,6 +15,7 @@ org.opendaylight.odlparent odlparent-lite 3.0.2 + org.opendaylight.netvirt diff --git a/sfc/classifier/api/pom.xml b/sfc/classifier/api/pom.xml new file mode 100644 index 0000000000..fd3ee69a4c --- /dev/null +++ b/sfc/classifier/api/pom.xml @@ -0,0 +1,51 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../../commons/binding-parent + + + sfc.classifier-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.mdsal.model + ietf-access-control-list + + + org.opendaylight.mdsal.model + yang-ext + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.opendaylight.yang.gen.v1.* + + + + + + + diff --git a/vpnservice/sfc/classifier/api/src/main/yang/netvirt-sfc-acl.yang b/sfc/classifier/api/src/main/yang/netvirt-sfc-acl.yang similarity index 100% rename from vpnservice/sfc/classifier/api/src/main/yang/netvirt-sfc-acl.yang rename to sfc/classifier/api/src/main/yang/netvirt-sfc-acl.yang diff --git a/vpnservice/sfc/classifier/api/src/main/yang/netvirt-sfc-classifier.yang b/sfc/classifier/api/src/main/yang/netvirt-sfc-classifier.yang similarity index 100% rename from vpnservice/sfc/classifier/api/src/main/yang/netvirt-sfc-classifier.yang rename to sfc/classifier/api/src/main/yang/netvirt-sfc-classifier.yang diff --git a/vpnservice/sfc/classifier/api/src/main/yang/netvirt-sfc.yang b/sfc/classifier/api/src/main/yang/netvirt-sfc.yang similarity index 100% rename from vpnservice/sfc/classifier/api/src/main/yang/netvirt-sfc.yang rename to sfc/classifier/api/src/main/yang/netvirt-sfc.yang diff --git a/sfc/classifier/impl/pom.xml b/sfc/classifier/impl/pom.xml new file mode 100644 index 0000000000..44bdbbf643 --- /dev/null +++ b/sfc/classifier/impl/pom.xml @@ -0,0 +1,147 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../../commons/binding-parent + + + sfc.classifier-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + 0.7.0-SNAPSHOT + + + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + org.opendaylight.infrautils + inject + ${infrautils.version} + + + org.opendaylight.mdsal.model + iana-if-type-2014-05-08 + + + org.opendaylight.mdsal.model + ietf-packet-fields + + + org.opendaylight.mdsal.model + ietf-topology + + + ${project.groupId} + sfc.classifier-api + ${project.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + org.opendaylight.openflowplugin + openflowjava-extension-nicira + ${openflowplugin.version} + + + org.opendaylight.openflowplugin + openflowplugin-extension-nicira + ${openflowplugin.version} + + + org.opendaylight.openflowplugin.model + model-flow-base + ${openflowplugin.version} + + + org.opendaylight.openflowplugin.model + model-flow-service + ${openflowplugin.version} + + + org.opendaylight.ovsdb + southbound-api + ${ovsdb.version} + + + org.opendaylight.ovsdb + southbound-impl + ${ovsdb.version} + + + org.opendaylight.sfc + sfc-model + ${sfc.version} + + + org.opendaylight.sfc + sfc-provider + ${sfc.version} + + + + + org.opendaylight.yangtools + testutils + test + + + org.opendaylight.controller + sal-binding-broker-impl + test-jar + test + + + com.google.guava + guava-testlib + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + + diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcAclListener.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcAclListener.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcAclListener.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcAclListener.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcClassifierListener.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcClassifierListener.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcClassifierListener.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcClassifierListener.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcRspListener.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcRspListener.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcRspListener.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/listeners/NetvirtSfcRspListener.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProvider.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProvider.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProvider.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProvider.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProvider.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/ClassifierService.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/ClassifierService.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/ClassifierService.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/ClassifierService.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntry.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierEntryRenderer.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierEntryRenderer.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierEntryRenderer.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierEntryRenderer.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierRenderableEntry.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierRenderableEntry.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierRenderableEntry.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierRenderableEntry.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierState.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierState.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierState.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/api/ClassifierState.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdate.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdate.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdate.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdate.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/GeniusRenderer.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/GeniusRenderer.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/GeniusRenderer.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/GeniusRenderer.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OpenflowRenderer.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OpenflowRenderer.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OpenflowRenderer.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OpenflowRenderer.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OperationalClassifierImpl.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OperationalClassifierImpl.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OperationalClassifierImpl.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/OperationalClassifierImpl.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatches.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatches.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatches.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatches.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutor.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutor.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutor.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutor.java diff --git a/vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java rename to sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java diff --git a/vpnservice/sfc/classifier/impl/src/main/resources/org/opendaylight/blueprint/sfc-classifier.xml b/sfc/classifier/impl/src/main/resources/org/opendaylight/blueprint/sfc-classifier.xml similarity index 100% rename from vpnservice/sfc/classifier/impl/src/main/resources/org/opendaylight/blueprint/sfc-classifier.xml rename to sfc/classifier/impl/src/main/resources/org/opendaylight/blueprint/sfc-classifier.xml diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTest.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTest.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTest.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTestParams.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTestParams.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTestParams.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProviderTestParams.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProviderTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProviderTest.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProviderTest.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/NetvirtProviderTest.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestOdlInterfaceRpcService.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestOdlInterfaceRpcService.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestOdlInterfaceRpcService.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestOdlInterfaceRpcService.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntryTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntryTest.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntryTest.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/ClassifierEntryTest.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdateTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdateTest.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdateTest.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ClassifierUpdateTest.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatchesTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatchesTest.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatchesTest.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/AclMatchesTest.java diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutorTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutorTest.java similarity index 100% rename from vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutorTest.java rename to sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/utils/LastTaskExecutorTest.java diff --git a/sfc/classifier/pom.xml b/sfc/classifier/pom.xml new file mode 100644 index 0000000000..c34848783f --- /dev/null +++ b/sfc/classifier/pom.xml @@ -0,0 +1,50 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + sfc.classifier + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + api + impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/sfc/pom.xml b/sfc/pom.xml new file mode 100644 index 0000000000..3df88da074 --- /dev/null +++ b/sfc/pom.xml @@ -0,0 +1,51 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + sfc + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + classifier + translator + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + + diff --git a/vpnservice/sfc/translator/pom.xml b/sfc/translator/pom.xml similarity index 100% rename from vpnservice/sfc/translator/pom.xml rename to sfc/translator/pom.xml diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/NeutronMdsalHelper.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/OpenStackSFCTranslatorProvider.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/OpenStackSFCTranslatorProvider.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/OpenStackSFCTranslatorProvider.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/OpenStackSFCTranslatorProvider.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java similarity index 100% rename from vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java rename to sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java diff --git a/vpnservice/sfc/translator/src/main/resources/org/opendaylight/blueprint/sfc-translator.xml b/sfc/translator/src/main/resources/org/opendaylight/blueprint/sfc-translator.xml similarity index 100% rename from vpnservice/sfc/translator/src/main/resources/org/opendaylight/blueprint/sfc-translator.xml rename to sfc/translator/src/main/resources/org/opendaylight/blueprint/sfc-translator.xml diff --git a/statemanager/impl/pom.xml b/statemanager/impl/pom.xml new file mode 100644 index 0000000000..08f5edf51c --- /dev/null +++ b/statemanager/impl/pom.xml @@ -0,0 +1,85 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + statemanager-impl + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.apache.commons + commons-lang3 + + + javax.inject + javax.inject + + + org.opendaylight.controller + sal-binding-api + + + ${project.groupId} + bgpmanager-api + ${project.version} + + + ${project.groupId} + elanmanager-api + ${project.version} + + + ${project.groupId} + fibmanager-api + ${project.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + + diff --git a/vpnservice/statemanager/impl/src/main/java/org/opendaylight/netvirt/statemanager/IStateManager.java b/statemanager/impl/src/main/java/org/opendaylight/netvirt/statemanager/IStateManager.java similarity index 100% rename from vpnservice/statemanager/impl/src/main/java/org/opendaylight/netvirt/statemanager/IStateManager.java rename to statemanager/impl/src/main/java/org/opendaylight/netvirt/statemanager/IStateManager.java diff --git a/vpnservice/statemanager/impl/src/main/java/org/opendaylight/netvirt/statemanager/StateManager.java b/statemanager/impl/src/main/java/org/opendaylight/netvirt/statemanager/StateManager.java similarity index 100% rename from vpnservice/statemanager/impl/src/main/java/org/opendaylight/netvirt/statemanager/StateManager.java rename to statemanager/impl/src/main/java/org/opendaylight/netvirt/statemanager/StateManager.java diff --git a/vpnservice/statemanager/impl/src/main/resources/org/opendaylight/blueprint/statemanager.xml b/statemanager/impl/src/main/resources/org/opendaylight/blueprint/statemanager.xml similarity index 100% rename from vpnservice/statemanager/impl/src/main/resources/org/opendaylight/blueprint/statemanager.xml rename to statemanager/impl/src/main/resources/org/opendaylight/blueprint/statemanager.xml diff --git a/statemanager/pom.xml b/statemanager/pom.xml new file mode 100644 index 0000000000..f6e03d164c --- /dev/null +++ b/statemanager/pom.xml @@ -0,0 +1,49 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + statemanager + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/statistics/api/pom.xml b/statistics/api/pom.xml new file mode 100644 index 0000000000..765ae9b29e --- /dev/null +++ b/statistics/api/pom.xml @@ -0,0 +1,22 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + statistics-api + bundle + ODL :: netvirt :: ${project.artifactId} + 4.0.0 + diff --git a/vpnservice/statistics/api/src/main/java/org/opendaylight/netvirt/statistics/api/ICountersInterfaceChangeHandler.java b/statistics/api/src/main/java/org/opendaylight/netvirt/statistics/api/ICountersInterfaceChangeHandler.java similarity index 100% rename from vpnservice/statistics/api/src/main/java/org/opendaylight/netvirt/statistics/api/ICountersInterfaceChangeHandler.java rename to statistics/api/src/main/java/org/opendaylight/netvirt/statistics/api/ICountersInterfaceChangeHandler.java diff --git a/vpnservice/statistics/api/src/main/yang/statistics.yang b/statistics/api/src/main/yang/statistics.yang similarity index 100% rename from vpnservice/statistics/api/src/main/yang/statistics.yang rename to statistics/api/src/main/yang/statistics.yang diff --git a/statistics/impl/pom.xml b/statistics/impl/pom.xml new file mode 100644 index 0000000000..b6bc4fb943 --- /dev/null +++ b/statistics/impl/pom.xml @@ -0,0 +1,99 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + statistics-impl + bundle + ODL :: netvirt :: ${project.artifactId} + 4.0.0 + + + + javax.inject + javax.inject + + + org.opendaylight.genius + idmanager-api + ${genius.version} + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.genius + mdsalutil-api + ${genius.version} + + + ${project.groupId} + statistics-api + ${project.version} + + + ${project.groupId} + vpnmanager-api + ${project.version} + + + + + + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/netvirt-statistics-config.xml + + xml + config + + + + + + + + + diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/AbstractCountersService.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/AbstractCountersService.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/AbstractCountersService.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/AbstractCountersService.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRequestType.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRequestType.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRequestType.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRequestType.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterResultDataStructure.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterResultDataStructure.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterResultDataStructure.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterResultDataStructure.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceInterfaceListener.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceInterfaceListener.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceInterfaceListener.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceInterfaceListener.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/EgressCountersServiceImpl.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/EgressCountersServiceImpl.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/EgressCountersServiceImpl.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/EgressCountersServiceImpl.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersDirection.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersDirection.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersDirection.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersDirection.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/IngressCountersServiceImpl.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/IngressCountersServiceImpl.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/IngressCountersServiceImpl.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/IngressCountersServiceImpl.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplier.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplier.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplier.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplier.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplierOutput.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplierOutput.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplierOutput.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/NodeConnectorStatisticsSupplierOutput.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java similarity index 100% rename from vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java rename to statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsProvider.java diff --git a/vpnservice/statistics/impl/src/main/resources/initial/netvirt-statistics-config.xml b/statistics/impl/src/main/resources/initial/netvirt-statistics-config.xml similarity index 100% rename from vpnservice/statistics/impl/src/main/resources/initial/netvirt-statistics-config.xml rename to statistics/impl/src/main/resources/initial/netvirt-statistics-config.xml diff --git a/vpnservice/statistics/impl/src/main/resources/org/opendaylight/blueprint/statistics.xml b/statistics/impl/src/main/resources/org/opendaylight/blueprint/statistics.xml similarity index 100% rename from vpnservice/statistics/impl/src/main/resources/org/opendaylight/blueprint/statistics.xml rename to statistics/impl/src/main/resources/org/opendaylight/blueprint/statistics.xml diff --git a/vpnservice/statistics/impl/src/main/yang/statistics-config.yang b/statistics/impl/src/main/yang/statistics-config.yang similarity index 100% rename from vpnservice/statistics/impl/src/main/yang/statistics-config.yang rename to statistics/impl/src/main/yang/statistics-config.yang diff --git a/statistics/pom.xml b/statistics/pom.xml new file mode 100644 index 0000000000..2858b6105c --- /dev/null +++ b/statistics/pom.xml @@ -0,0 +1,49 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + statistics + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + api + impl + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/vpnmanager/pom.xml b/vpnmanager/pom.xml new file mode 100644 index 0000000000..9b3c0d3960 --- /dev/null +++ b/vpnmanager/pom.xml @@ -0,0 +1,50 @@ + + + + + + org.opendaylight.odlparent + odlparent-lite + 3.0.2 + + + + org.opendaylight.netvirt + vpnmanager + 0.6.0-SNAPSHOT + ODL :: netvirt :: ${project.artifactId} + pom + 4.0.0 + + + vpnmanager-api + vpnmanager-impl + vpnmanager-shell + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + diff --git a/vpnmanager/vpnmanager-api/pom.xml b/vpnmanager/vpnmanager-api/pom.xml new file mode 100644 index 0000000000..73d7afcd7b --- /dev/null +++ b/vpnmanager/vpnmanager-api/pom.xml @@ -0,0 +1,79 @@ + + + + + + org.opendaylight.netvirt + binding-parent + 0.6.0-SNAPSHOT + ../../commons/binding-parent + + + vpnmanager-api + ODL :: netvirt :: ${project.artifactId} + bundle + 4.0.0 + + + + org.opendaylight.genius + interfacemanager-api + ${genius.version} + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + iana-if-type-2014-05-08 + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-interfaces + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + yang-ext + + + ${project.groupId} + bgpmanager-api + ${project.version} + + + ${project.groupId} + fibmanager-api + ${project.version} + + + ${project.groupId} + model-bgp + ${model.bgp.version} + + + ${project.groupId} + neutronvpn-api + ${project.version} + + + org.opendaylight.yangtools + yang-common + + + diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/ICentralizedSwitchProvider.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnFootprintService.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkCache.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java b/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java rename to vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/yang/inter-vpn-link.yang b/vpnmanager/vpnmanager-api/src/main/yang/inter-vpn-link.yang similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/yang/inter-vpn-link.yang rename to vpnmanager/vpnmanager-api/src/main/yang/inter-vpn-link.yang diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/yang/l3vpn.yang b/vpnmanager/vpnmanager-api/src/main/yang/l3vpn.yang similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/yang/l3vpn.yang rename to vpnmanager/vpnmanager-api/src/main/yang/l3vpn.yang diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/yang/odl-l3vpn.yang b/vpnmanager/vpnmanager-api/src/main/yang/odl-l3vpn.yang similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/yang/odl-l3vpn.yang rename to vpnmanager/vpnmanager-api/src/main/yang/odl-l3vpn.yang diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/yang/vpn-rpc.yang b/vpnmanager/vpnmanager-api/src/main/yang/vpn-rpc.yang similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-api/src/main/yang/vpn-rpc.yang rename to vpnmanager/vpnmanager-api/src/main/yang/vpn-rpc.yang diff --git a/vpnservice/vpnmanager/vpnmanager-impl/pom.xml b/vpnmanager/vpnmanager-impl/pom.xml similarity index 90% rename from vpnservice/vpnmanager/vpnmanager-impl/pom.xml rename to vpnmanager/vpnmanager-impl/pom.xml index 61d057c707..50524ff739 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/pom.xml +++ b/vpnmanager/vpnmanager-impl/pom.xml @@ -1,5 +1,5 @@ - - org.opendaylight.controller - sal-binding-broker-impl - test - test-jar + org.opendaylight.controller + sal-binding-broker-impl + test + test-jar + + org.apache.aries.blueprint + blueprint-maven-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + + + + + org.codehaus.mojo build-helper-maven-plugin @@ -120,7 +138,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - ${project.build.directory}/classes/initial/netvirt-vpnmanager-config.xml + ${project.build.directory}/classes/initial/netvirt-vpnmanager-config.xml + xml config @@ -129,24 +148,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorEventListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStopTask.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpReplyOrRequest.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchProvider.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/MacEntry.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/UpdateData.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnConstants.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNodeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnNotifyTask.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpDataSyncer.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnRpcServiceImpl.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheFeeder.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocator.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateCacheFeeder.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCleanedCheckerTask.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkCreatorTask.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/tasks/InterVpnLinkRemoverTask.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/input/L3vpnInput.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/registry/L3vpnRegistry.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java b/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java rename to vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/utilities/VpnManagerCounters.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/resources/initial/netvirt-vpnmanager-config.xml b/vpnmanager/vpnmanager-impl/src/main/resources/initial/netvirt-vpnmanager-config.xml similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/resources/initial/netvirt-vpnmanager-config.xml rename to vpnmanager/vpnmanager-impl/src/main/resources/initial/netvirt-vpnmanager-config.xml diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml b/vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml rename to vpnmanager/vpnmanager-impl/src/main/resources/org/opendaylight/blueprint/vpnmanager.xml diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/yang/vpnmanager-config.yang b/vpnmanager/vpnmanager-impl/src/main/yang/vpnmanager-config.yang similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/main/yang/vpnmanager-config.yang rename to vpnmanager/vpnmanager-impl/src/main/yang/vpnmanager-config.yang diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java b/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java rename to vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkLocatorTest.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java b/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java rename to vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java b/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java rename to vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java b/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java rename to vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java b/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java rename to vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java b/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java rename to vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java diff --git a/vpnservice/vpnmanager/vpnmanager-shell/pom.xml b/vpnmanager/vpnmanager-shell/pom.xml similarity index 99% rename from vpnservice/vpnmanager/vpnmanager-shell/pom.xml rename to vpnmanager/vpnmanager-shell/pom.xml index fa9e8820c5..d9ec76dac1 100644 --- a/vpnservice/vpnmanager/vpnmanager-shell/pom.xml +++ b/vpnmanager/vpnmanager-shell/pom.xml @@ -16,11 +16,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ../../commons/binding-parent - 4.0.0 vpnmanager-shell ODL :: netvirt :: ${project.artifactId} - bundle + 4.0.0 + org.apache.karaf.shell @@ -33,5 +33,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.version} - diff --git a/vpnservice/vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java b/vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java rename to vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpn.java diff --git a/vpnservice/vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java b/vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java rename to vpnmanager/vpnmanager-shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java diff --git a/vpnservice/vpnmanager/vpnmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/vpnmanager/vpnmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from vpnservice/vpnmanager/vpnmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to vpnmanager/vpnmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/vpnservice/.gitignore b/vpnservice/.gitignore deleted file mode 100644 index bbbe4f26f3..0000000000 --- a/vpnservice/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v1.0 which accompanies this distribution, -# and is available at http://www.eclipse.org/legal/epl-v10.html -# -.classpath -.project -.settings -.metadata -target -*.iml -.idea -bin -xtend-gen -target -.DS_Store -.checkstyle -yang-gen-config -yang-gen-sal -classes -maven-metadata-local.xml -META-INF diff --git a/vpnservice/.gitreview b/vpnservice/.gitreview deleted file mode 100644 index a959a5e321..0000000000 --- a/vpnservice/.gitreview +++ /dev/null @@ -1,5 +0,0 @@ -[gerrit] -host=git.opendaylight.org -port=29418 -project=vpnservice.git -defaultbranch=master diff --git a/vpnservice/aclservice/api/pom.xml b/vpnservice/aclservice/api/pom.xml deleted file mode 100644 index 3672cfb757..0000000000 --- a/vpnservice/aclservice/api/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - aclservice-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - org.opendaylight.mdsal.model - ietf-access-control-list - - - org.opendaylight.mdsal.model - ietf-interfaces - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - yang-ext - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - diff --git a/vpnservice/aclservice/impl/pom.xml b/vpnservice/aclservice/impl/pom.xml deleted file mode 100644 index 8d6ab23564..0000000000 --- a/vpnservice/aclservice/impl/pom.xml +++ /dev/null @@ -1,194 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - aclservice-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - - ${project.groupId} - aclservice-api - ${project.version} - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller - sal-binding-broker-impl - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - org.opendaylight.infrautils - inject - ${infrautils.version} - - - org.opendaylight.infrautils - jobcoordinator-impl - ${infrautils.version} - test - - - com.googlecode.java-ipv6 - java-ipv6 - 0.16 - - - - - org.opendaylight.infrautils - infrautils-testutils - ${infrautils.version} - test - - - org.opendaylight.infrautils - inject.guice.testutils - ${infrautils.version} - test - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - test-jar - test - - - org.opendaylight.genius - mdsalutil-testutils - ${genius.version} - test - - - org.opendaylight.genius - testutils - ${genius.version} - test - - - org.opendaylight.genius - interfacemanager-impl - ${genius.version} - test - - - org.opendaylight.yangtools - testutils - test - - - org.opendaylight.controller - sal-binding-broker-impl - test-jar - test - - - org.opendaylight.mdsal - mdsal-binding-test-utils - test - - - org.immutables - value - test - - - com.google.truth - truth - test - - - org.apache.karaf.shell - org.apache.karaf.shell.console - provided - - - - - - - org.eclipse.xtend - xtend-maven-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/netvirt-aclservice-config.xml - xml - config - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/aclservice/pom.xml b/vpnservice/aclservice/pom.xml deleted file mode 100644 index c6b4f44981..0000000000 --- a/vpnservice/aclservice/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - aclservice - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - api - impl - shell - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/aclservice/shell/pom.xml b/vpnservice/aclservice/shell/pom.xml deleted file mode 100644 index 4e70764f27..0000000000 --- a/vpnservice/aclservice/shell/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - aclservice-shell - ODL :: netvirt :: ${project.artifactId} - bundle - - - ${project.groupId} - aclservice-api - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.console - provided - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.netvirt - aclservice-impl - 0.6.0-SNAPSHOT - - - - diff --git a/vpnservice/bgpmanager/bgpmanager-impl/pom.xml b/vpnservice/bgpmanager/bgpmanager-impl/pom.xml deleted file mode 100644 index 1c13a9b04c..0000000000 --- a/vpnservice/bgpmanager/bgpmanager-impl/pom.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - bgpmanager-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - ${project.groupId} - bgpmanager-api - ${project.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - ${project.groupId} - model-bgp - ${model.bgp.version} - - - org.apache.thrift - libthrift - 0.9.3 - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - org.opendaylight.controller - sal-binding-broker-impl - test - - - org.opendaylight.controller - sal-binding-broker-impl - test - test-jar - - - org.apache.karaf.shell - org.apache.karaf.shell.console - provided - - - com.google.truth - truth - test - - - org.opendaylight.infrautils - metrics-api - ${infrautils.version} - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - **/gen/**/* - - - - org.apache.maven.plugins - maven-pmd-plugin - - **/gen/**/* - - - - org.codehaus.mojo - findbugs-maven-plugin - - true - - - org.opendaylight.netvirt.bgpmanager.*,org.opendaylight.netvirt.bgpmanager.commands.*,org.opendaylight.netvirt.bgpmanager.oam.*,org.opendaylight.netvirt.bgpmanager.thrift.client.*,org.opendaylight.netvirt.bgpmanager.thrift.server.* - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/bgpmanager/pom.xml b/vpnservice/bgpmanager/pom.xml deleted file mode 100644 index 0048c34ae4..0000000000 --- a/vpnservice/bgpmanager/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - bgpmanager - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - - bgpmanager-api - bgpmanager-impl - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/cache/impl/pom.xml b/vpnservice/cache/impl/pom.xml deleted file mode 100644 index a8c911bc91..0000000000 --- a/vpnservice/cache/impl/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - cache-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - org.ops4j.pax.cdi - pax-cdi-api - true - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/cache/pom.xml b/vpnservice/cache/pom.xml deleted file mode 100644 index 650b357e26..0000000000 --- a/vpnservice/cache/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - cache - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - - - impl - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-api/pom.xml b/vpnservice/cloud-servicechain/cloud-servicechain-api/pom.xml deleted file mode 100644 index 58e24b9ae7..0000000000 --- a/vpnservice/cloud-servicechain/cloud-servicechain-api/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - cloud-servicechain-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.opendaylight.mdsal.model - yang-ext - - - ${project.groupId} - elanmanager-api - ${project.version} - - - diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/pom.xml b/vpnservice/cloud-servicechain/cloud-servicechain-impl/pom.xml deleted file mode 100644 index d5157b2262..0000000000 --- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - cloud-servicechain-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - - ${project.groupId} - cloud-servicechain-api - ${project.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.controller - sal-binding-broker-impl - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - ${project.groupId} - fibmanager-api - ${project.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - javax.inject - javax.inject - - - org.opendaylight.infrautils - metrics-impl-test - ${infrautils.version} - test - - - org.opendaylight.infrautils - jobcoordinator-impl - ${infrautils.version} - test - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - diff --git a/vpnservice/cloud-servicechain/pom.xml b/vpnservice/cloud-servicechain/pom.xml deleted file mode 100644 index ce463ef577..0000000000 --- a/vpnservice/cloud-servicechain/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - cloud-servicechain - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - cloud-servicechain-api - cloud-servicechain-impl - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - diff --git a/vpnservice/coe/api/pom.xml b/vpnservice/coe/api/pom.xml deleted file mode 100644 index 124b7757ef..0000000000 --- a/vpnservice/coe/api/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - coe-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.yangtools - yang-common - - - diff --git a/vpnservice/coe/impl/pom.xml b/vpnservice/coe/impl/pom.xml deleted file mode 100644 index f2ed89653e..0000000000 --- a/vpnservice/coe/impl/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - coe-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - - ${project.groupId} - coe-api - ${project.version} - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.coe - coe-northbound-api - 0.3.0-SNAPSHOT - - - javax.inject - javax.inject - - - org.opendaylight.netvirt - elanmanager-api - ${project.version} - - - org.opendaylight.infrautils - jobcoordinator-api - ${infrautils.version} - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.eclipse.xtend - xtend-maven-plugin - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - diff --git a/vpnservice/coe/pom.xml b/vpnservice/coe/pom.xml deleted file mode 100644 index fea1903a6b..0000000000 --- a/vpnservice/coe/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - 0.6.0-SNAPSHOT - coe - ODL :: netvirt :: ${project.artifactId} - pom - - - api - impl - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - diff --git a/vpnservice/commons/pom.xml b/vpnservice/commons/pom.xml deleted file mode 100644 index e4fbbf987d..0000000000 --- a/vpnservice/commons/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - commons - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - binding-parent - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/dhcpservice/dhcpservice-api/pom.xml b/vpnservice/dhcpservice/dhcpservice-api/pom.xml deleted file mode 100644 index 5a091973be..0000000000 --- a/vpnservice/dhcpservice/dhcpservice-api/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - dhcpservice-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.mdsal.model - yang-ext - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - diff --git a/vpnservice/dhcpservice/dhcpservice-impl/pom.xml b/vpnservice/dhcpservice/dhcpservice-impl/pom.xml deleted file mode 100644 index 5852d135f4..0000000000 --- a/vpnservice/dhcpservice/dhcpservice-impl/pom.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - dhcpservice-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - ${project.groupId} - dhcpservice-api - ${project.version} - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.mdsal - mdsal-eos-binding-api - - - org.opendaylight.openflowplugin.model - model-flow-service - ${openflowplugin.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.console - provided - - - org.opendaylight.neutron - model - ${neutron.version} - - - commons-net - commons-net - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - org.opendaylight.genius - itm-api - ${genius.version} - - - org.opendaylight.ovsdb - hwvtepsouthbound-api - ${ovsdb.version} - - - org.opendaylight.infrautils - counters-api - ${infrautils.version} - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - javax.inject - javax.inject - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/netvirt-dhcpservice-config.xml - xml - config - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/dhcpservice/pom.xml b/vpnservice/dhcpservice/pom.xml deleted file mode 100644 index 4ec14c8fe3..0000000000 --- a/vpnservice/dhcpservice/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - dhcpservice - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - dhcpservice-api - dhcpservice-impl - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/distribution/karaf/pom.xml b/vpnservice/distribution/karaf/pom.xml deleted file mode 100644 index 0bf40db35c..0000000000 --- a/vpnservice/distribution/karaf/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 3.0.2 - - - 4.0.0 - org.opendaylight.netvirt - vpnservice-karaf - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - - - - - - - - org.apache.karaf.features - framework - ${karaf.version} - kar - compile - - - - ${project.groupId} - netvirt-features - ${project.version} - features - xml - runtime - - - - - org.opendaylight.controller - features-mdsal-trace - 1.7.0-SNAPSHOT - features - xml - runtime - - - - - org.opendaylight.controller - features-extras - 1.10.0-SNAPSHOT - xml - features - runtime - - - - - org.opendaylight.aaa - aaa-cli-jar - 0.7.0-SNAPSHOT - - test - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - false - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-aaa-cli-jar - prepare-package - - copy - - - - - org.opendaylight.aaa - aaa-cli-jar - 0.7.0-SNAPSHOT - - - ${project.build.directory}/assembly/bin - aaa-cli-jar - true - true - true - true - - true - - - - - - - - diff --git a/vpnservice/elanmanager/elanmanager-api/pom.xml b/vpnservice/elanmanager/elanmanager-api/pom.xml deleted file mode 100644 index f155ef4de0..0000000000 --- a/vpnservice/elanmanager/elanmanager-api/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - elanmanager-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.opendaylight.mdsal.model - yang-ext - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - org.opendaylight.mdsal.model - ietf-interfaces - - - org.opendaylight.controller.model - model-inventory - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - diff --git a/vpnservice/elanmanager/elanmanager-impl/pom.xml b/vpnservice/elanmanager/elanmanager-impl/pom.xml deleted file mode 100644 index 00799536e1..0000000000 --- a/vpnservice/elanmanager/elanmanager-impl/pom.xml +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - elanmanager-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - - ${project.groupId} - elanmanager-api - ${project.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - org.opendaylight.infrautils - diagstatus-api - ${infrautils.version} - - - org.ops4j.pax.cdi - pax-cdi-api - true - - - org.opendaylight.genius - itm-api - ${genius.version} - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - org.opendaylight.controller - sal-binding-broker-impl - - - org.opendaylight.ovsdb - hwvtepsouthbound-api - ${ovsdb.version} - - - org.opendaylight.neutron - model - ${neutron.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.console - provided - - - ${project.groupId} - dhcpservice-api - ${project.version} - - - org.opendaylight.ovsdb - southbound-api - ${ovsdb.version} - - - org.opendaylight.ovsdb - utils.mdsal-utils - ${ovsdb.version} - - - org.opendaylight.ovsdb - utils.southbound-utils - ${ovsdb.version} - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - - - org.opendaylight.yangtools - testutils - test - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - test - test-jar - - - org.opendaylight.genius - mdsalutil-impl - ${genius.version} - test - - - org.opendaylight.controller - sal-binding-broker-impl - test - test-jar - - - org.opendaylight.mdsal - mdsal-binding-test-utils - test - - - org.opendaylight.genius - lockmanager-impl - ${genius.version} - test - - - org.opendaylight.genius - idmanager-impl - ${genius.version} - test - - - org.opendaylight.genius - interfacemanager-impl - ${genius.version} - test - - - org.opendaylight.infrautils - inject.guice.testutils - ${infrautils.version} - test - - - org.opendaylight.infrautils - infrautils-testutils - ${infrautils.version} - test - - - org.opendaylight.genius - mdsalutil-testutils - ${genius.version} - test - - - org.opendaylight.netvirt - neutronvpn-impl - ${project.version} - test - - - org.opendaylight.genius - testutils - ${genius.version} - test - - - org.opendaylight.openflowplugin - openflowplugin-extension-nicira - ${openflowplugin.version} - - - org.opendaylight.openflowplugin.model - model-flow-service - ${openflowplugin.version} - - - org.opendaylight.openflowplugin.model - model-flow-base - ${openflowplugin.version} - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - true - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/netvirt-elanmanager-config.xml - xml - config - - - - - - - - org.eclipse.xtend - xtend-maven-plugin - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/elanmanager/pom.xml b/vpnservice/elanmanager/pom.xml deleted file mode 100644 index 2c2f96230c..0000000000 --- a/vpnservice/elanmanager/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - elanmanager - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - elanmanager-api - elanmanager-impl - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/fibmanager/fibmanager-api/pom.xml b/vpnservice/fibmanager/fibmanager-api/pom.xml deleted file mode 100644 index 0f92da9dd7..0000000000 --- a/vpnservice/fibmanager/fibmanager-api/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - fibmanager-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - org.opendaylight.mdsal.model - ietf-interfaces - - - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 - - - org.opendaylight.controller.model - model-inventory - - - org.opendaylight.openflowplugin.model - model-flow-base - ${openflowplugin.version} - - - org.opendaylight.genius - itm-api - ${genius.version} - - - diff --git a/vpnservice/fibmanager/fibmanager-impl/pom.xml b/vpnservice/fibmanager/fibmanager-impl/pom.xml deleted file mode 100644 index 3830125706..0000000000 --- a/vpnservice/fibmanager/fibmanager-impl/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - fibmanager-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - ${project.groupId} - fibmanager-api - ${project.version} - - - ${project.groupId} - bgpmanager-api - ${project.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - org.opendaylight.openflowplugin.model - model-flow-service - ${openflowplugin.version} - - - javax.inject - javax.inject - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/fibmanager/fibmanager-shell/pom.xml b/vpnservice/fibmanager/fibmanager-shell/pom.xml deleted file mode 100644 index 92993ba055..0000000000 --- a/vpnservice/fibmanager/fibmanager-shell/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - fibmanager-shell - ODL :: netvirt :: ${project.artifactId} - bundle - - - ${project.groupId} - fibmanager-api - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.console - provided - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - - diff --git a/vpnservice/fibmanager/pom.xml b/vpnservice/fibmanager/pom.xml deleted file mode 100644 index 55538796ff..0000000000 --- a/vpnservice/fibmanager/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - fibmanager - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - fibmanager-api - fibmanager-impl - fibmanager-shell - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/ipv6service/api/pom.xml b/vpnservice/ipv6service/api/pom.xml deleted file mode 100644 index dc8ba44197..0000000000 --- a/vpnservice/ipv6service/api/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - ipv6service-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - org.opendaylight.mdsal.model - ietf-interfaces - - - diff --git a/vpnservice/ipv6service/impl/pom.xml b/vpnservice/ipv6service/impl/pom.xml deleted file mode 100644 index c8b590b8c5..0000000000 --- a/vpnservice/ipv6service/impl/pom.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - ipv6service-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - - ${project.groupId} - ipv6service-api - ${project.version} - - - org.opendaylight.openflowplugin.model - model-flow-service - ${openflowplugin.version} - - - org.opendaylight.neutron - model - ${neutron.version} - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.ovsdb - southbound-api - ${ovsdb.version} - - - org.opendaylight.openflowplugin - openflowplugin-api - ${openflowplugin.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - org.powermock - powermock-api-mockito - - - org.powermock - powermock-module-junit4 - - - org.slf4j - slf4j-simple - test - - - ${project.groupId} - elanmanager-api - ${project.version} - - - javax.inject - javax.inject - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - diff --git a/vpnservice/ipv6service/pom.xml b/vpnservice/ipv6service/pom.xml deleted file mode 100644 index 68a28c7ed3..0000000000 --- a/vpnservice/ipv6service/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - ipv6service - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - api - impl - shell - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - diff --git a/vpnservice/ipv6service/shell/pom.xml b/vpnservice/ipv6service/shell/pom.xml deleted file mode 100644 index 27a9c5af0a..0000000000 --- a/vpnservice/ipv6service/shell/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - ipv6service-shell - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.apache.karaf.shell - org.apache.karaf.shell.console - provided - - - org.opendaylight.netvirt - ipv6service-api - ${project.version} - - - org.opendaylight.infrautils - infrautils-util - 1.3.0-SNAPSHOT - - - org.osgi - org.osgi.core - provided - - - - diff --git a/vpnservice/model-bgp/pom.xml b/vpnservice/model-bgp/pom.xml deleted file mode 100644 index 0e56dce7b9..0000000000 --- a/vpnservice/model-bgp/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../commons/binding-parent - - - 4.0.0 - model-bgp - 2013.07.15.12.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - ${project.artifactId} - bundle - - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - - diff --git a/vpnservice/natservice/natservice-api/pom.xml b/vpnservice/natservice/natservice-api/pom.xml deleted file mode 100644 index ee40ae5293..0000000000 --- a/vpnservice/natservice/natservice-api/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - natservice-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - diff --git a/vpnservice/natservice/natservice-impl/pom.xml b/vpnservice/natservice/natservice-impl/pom.xml deleted file mode 100644 index a50a819430..0000000000 --- a/vpnservice/natservice/natservice-impl/pom.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - natservice-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - ${project.groupId} - natservice-api - ${project.version} - - - org.opendaylight.genius - arputil-api - ${genius.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.genius - itm-api - ${genius.version} - - - ${project.groupId} - bgpmanager-api - ${project.version} - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - ${project.groupId} - fibmanager-api - ${project.version} - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - org.opendaylight.openflowplugin.model - model-flow-service - ${openflowplugin.version} - - - org.opendaylight.controller - sal-binding-broker-impl - - - commons-net - commons-net - - - org.powermock - powermock-api-mockito - test - - - org.powermock - powermock-module-junit4 - test - - - org.opendaylight.infrautils - counters-api - ${infrautils.version} - - - javax.inject - javax.inject - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/netvirt-natservice-config.xml - xml - config - - - - - - - - - - diff --git a/vpnservice/natservice/pom.xml b/vpnservice/natservice/pom.xml deleted file mode 100644 index 65f4bb2f0c..0000000000 --- a/vpnservice/natservice/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - natservice - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - natservice-api - natservice-impl - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/neutronvpn/neutronvpn-impl/pom.xml b/vpnservice/neutronvpn/neutronvpn-impl/pom.xml deleted file mode 100644 index d2f1e2c4dd..0000000000 --- a/vpnservice/neutronvpn/neutronvpn-impl/pom.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - neutronvpn-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - org.opendaylight.neutron - model - ${neutron.version} - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - org.opendaylight.genius - arputil-api - ${genius.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.genius - itm-api - ${genius.version} - - - org.opendaylight.ovsdb - hwvtepsouthbound-api - ${ovsdb.version} - - - ${project.groupId} - natservice-api - ${project.version} - - - ${project.groupId} - aclservice-api - ${project.version} - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - org.opendaylight.ovsdb - southbound-api - ${ovsdb.version} - - - org.opendaylight.ovsdb - utils.mdsal-utils - ${ovsdb.version} - - - org.opendaylight.ovsdb - utils.southbound-utils - ${ovsdb.version} - - - javax.inject - javax.inject - - - ${project.groupId} - alarm-impl - ${project.version} - - - org.opendaylight.infrautils - jobcoordinator-impl - ${infrautils.version} - test - - - org.opendaylight.infrautils - caches-test - ${infrautils.version} - test - - - com.google.code.gson - gson - - - org.opendaylight.neutron - neutron-spi - ${neutron.version} - - - org.opendaylight.infrautils - metrics-impl-test - ${infrautils.version} - test - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/netvirt-neutronvpn-config.xml - xml - config - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/neutronvpn/pom.xml b/vpnservice/neutronvpn/pom.xml deleted file mode 100644 index faad3373e0..0000000000 --- a/vpnservice/neutronvpn/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - neutronvpn - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - neutronvpn-api - neutronvpn-impl - neutronvpn-shell - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/ovsdb-ui/pom.xml b/vpnservice/ovsdb-ui/pom.xml deleted file mode 100644 index fbc126beb5..0000000000 --- a/vpnservice/ovsdb-ui/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - ovsdb-ui - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - - module - bundle - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/policyservice/api/pom.xml b/vpnservice/policyservice/api/pom.xml deleted file mode 100644 index 5177ddd60e..0000000000 --- a/vpnservice/policyservice/api/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - policyservice-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - org.opendaylight.mdsal.model - opendaylight-l2-types - - - ${project.groupId} - aclservice-api - ${project.version} - - - diff --git a/vpnservice/policyservice/impl/pom.xml b/vpnservice/policyservice/impl/pom.xml deleted file mode 100644 index 6ba4250ef2..0000000000 --- a/vpnservice/policyservice/impl/pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - policyservice-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - - ${project.groupId} - policyservice-api - ${project.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - org.opendaylight.genius - itm-api - ${genius.version} - - - javax.inject - javax.inject - - - ${project.groupId} - aclservice-api - ${project.version} - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito - test - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/policyservice/pom.xml b/vpnservice/policyservice/pom.xml deleted file mode 100644 index 418a8f062c..0000000000 --- a/vpnservice/policyservice/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - policyservice - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - api - impl - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - diff --git a/vpnservice/pom.xml b/vpnservice/pom.xml deleted file mode 100644 index 145f35c3e1..0000000000 --- a/vpnservice/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - org.opendaylight.netvirt - vpnservice - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - cache - coe - commons - model-bgp - vpnmanager - elanmanager - fibmanager - bgpmanager - neutronvpn - dhcpservice - cloud-servicechain - natservice - aclservice - ipv6service - qosservice - - distribution/karaf - features - statemanager - statistics - - alarm - - - - - sfc - - true - - - sfc - sfc-artifacts - - - - - no-sfc - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - scm:git:ssh://git.opendaylight.org:29418/netvirt.git - scm:git:ssh://git.opendaylight.org:29418/netvirt.git - https://wiki.opendaylight.org/view/NetVirt - HEAD - - - diff --git a/vpnservice/qosservice/api/pom.xml b/vpnservice/qosservice/api/pom.xml deleted file mode 100644 index 97842617c4..0000000000 --- a/vpnservice/qosservice/api/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - qosservice-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.mdsal.model - yang-ext - - - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 - - - diff --git a/vpnservice/sfc/classifier/api/pom.xml b/vpnservice/sfc/classifier/api/pom.xml deleted file mode 100644 index 0985b5a366..0000000000 --- a/vpnservice/sfc/classifier/api/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../../commons/binding-parent - - - sfc.classifier-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.opendaylight.mdsal.model - ietf-access-control-list - - - org.opendaylight.mdsal.model - yang-ext - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - org.opendaylight.yang.gen.v1.* - - - - - - - - diff --git a/vpnservice/sfc/classifier/impl/pom.xml b/vpnservice/sfc/classifier/impl/pom.xml deleted file mode 100644 index 14162d1c34..0000000000 --- a/vpnservice/sfc/classifier/impl/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../../commons/binding-parent - - - sfc.classifier-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - 0.7.0-SNAPSHOT - - - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - org.opendaylight.infrautils - inject - ${infrautils.version} - - - org.opendaylight.mdsal.model - ietf-topology - - - org.opendaylight.mdsal.model - ietf-packet-fields - - - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - ${project.groupId} - sfc.classifier-api - ${project.version} - - - org.opendaylight.openflowplugin - openflowjava-extension-nicira - ${openflowplugin.version} - - - org.opendaylight.openflowplugin - openflowplugin-extension-nicira - ${openflowplugin.version} - - - org.opendaylight.openflowplugin.model - model-flow-base - ${openflowplugin.version} - - - org.opendaylight.openflowplugin.model - model-flow-service - ${openflowplugin.version} - - - org.opendaylight.ovsdb - southbound-api - ${ovsdb.version} - - - org.opendaylight.ovsdb - southbound-impl - ${ovsdb.version} - - - org.opendaylight.sfc - sfc-model - ${sfc.version} - - - org.opendaylight.sfc - sfc-provider - ${sfc.version} - - - - - org.opendaylight.yangtools - testutils - test - - - org.opendaylight.controller - sal-binding-broker-impl - test-jar - test - - - com.google.guava - guava-testlib - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/sfc/classifier/pom.xml b/vpnservice/sfc/classifier/pom.xml deleted file mode 100644 index 04cd00e414..0000000000 --- a/vpnservice/sfc/classifier/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - sfc.classifier - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - - api - impl - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/sfc/pom.xml b/vpnservice/sfc/pom.xml deleted file mode 100644 index 2c3c36848e..0000000000 --- a/vpnservice/sfc/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - sfc - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - - classifier - translator - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/statemanager/impl/pom.xml b/vpnservice/statemanager/impl/pom.xml deleted file mode 100644 index 762c272404..0000000000 --- a/vpnservice/statemanager/impl/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - statemanager-impl - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.apache.commons - commons-lang3 - - - org.opendaylight.controller - sal-binding-api - - - ${project.groupId} - bgpmanager-api - ${project.version} - - - ${project.groupId} - elanmanager-api - ${project.version} - - - ${project.groupId} - fibmanager-api - ${project.version} - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - javax.inject - javax.inject - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - - - diff --git a/vpnservice/statemanager/pom.xml b/vpnservice/statemanager/pom.xml deleted file mode 100644 index 71c4d73440..0000000000 --- a/vpnservice/statemanager/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - statemanager - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - impl - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/statistics/api/pom.xml b/vpnservice/statistics/api/pom.xml deleted file mode 100644 index 48e811ae46..0000000000 --- a/vpnservice/statistics/api/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - statistics-api - bundle - ODL :: netvirt :: ${project.artifactId} - diff --git a/vpnservice/statistics/impl/pom.xml b/vpnservice/statistics/impl/pom.xml deleted file mode 100644 index d768236c85..0000000000 --- a/vpnservice/statistics/impl/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - statistics-impl - bundle - ODL :: netvirt :: ${project.artifactId} - - - - javax.inject - javax.inject - - - org.opendaylight.genius - idmanager-api - ${genius.version} - - - org.opendaylight.genius - mdsalutil-api - ${genius.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - ${project.groupId} - statistics-api - ${project.version} - - - ${project.groupId} - vpnmanager-api - ${project.version} - - - - - - - org.apache.aries.blueprint - blueprint-maven-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/netvirt-statistics-config.xml - xml - config - - - - - - - - - - diff --git a/vpnservice/statistics/pom.xml b/vpnservice/statistics/pom.xml deleted file mode 100644 index d33ff73d59..0000000000 --- a/vpnservice/statistics/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - statistics - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - - - scm:git:ssh://git.opendaylight.org:29418/statistics.git - scm:git:ssh://git.opendaylight.org:29418/statistics.git - HEAD - https://wiki.opendaylight.org/view/statistics:Main - - - - api - impl - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/vpnmanager/pom.xml b/vpnservice/vpnmanager/pom.xml deleted file mode 100644 index 68bff4762a..0000000000 --- a/vpnservice/vpnmanager/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - org.opendaylight.odlparent - odlparent-lite - 3.0.2 - - - - org.opendaylight.netvirt - vpnmanager - 0.6.0-SNAPSHOT - ODL :: netvirt :: ${project.artifactId} - pom - 4.0.0 - - vpnmanager-api - vpnmanager-impl - vpnmanager-shell - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - diff --git a/vpnservice/vpnmanager/vpnmanager-api/pom.xml b/vpnservice/vpnmanager/vpnmanager-api/pom.xml deleted file mode 100644 index fc22d87c3e..0000000000 --- a/vpnservice/vpnmanager/vpnmanager-api/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - org.opendaylight.netvirt - binding-parent - 0.6.0-SNAPSHOT - ../../commons/binding-parent - - - 4.0.0 - vpnmanager-api - ODL :: netvirt :: ${project.artifactId} - bundle - - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.mdsal.model - yang-ext - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - org.opendaylight.mdsal.model - ietf-interfaces - - - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 - - - ${project.groupId} - model-bgp - ${model.bgp.version} - - - ${project.groupId} - fibmanager-api - ${project.version} - - - ${project.groupId} - bgpmanager-api - ${project.version} - - - org.opendaylight.genius - interfacemanager-api - ${genius.version} - - - ${project.groupId} - neutronvpn-api - ${project.version} - - - -- 2.36.6