From dd6361e66639f532bff7efde380167fdffe3efbc Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Wed, 25 Feb 2015 10:09:40 -0700 Subject: [PATCH] Fixed package directory issues. Change-Id: I1a8c8cdcaf862e0f12454bc8cf87486bdf5d5e82 Signed-off-by: Ed Warnicke --- .../INeutronFirewallAware.java | 2 +- .../INeutronFirewallCRUD.java | 2 +- .../INeutronFirewallPolicyAware.java | 2 +- .../INeutronFirewallPolicyCRUD.java | 2 +- .../INeutronFirewallRuleAware.java | 2 +- .../INeutronFirewallRuleCRUD.java | 2 +- .../INeutronFloatingIPAware.java | 2 +- .../INeutronFloatingIPCRUD.java | 2 +- .../INeutronLoadBalancerAware.java | 2 +- .../INeutronLoadBalancerCRUD.java | 2 +- ...NeutronLoadBalancerHealthMonitorAware.java | 2 +- ...INeutronLoadBalancerHealthMonitorCRUD.java | 2 +- .../INeutronLoadBalancerListenerAware.java | 2 +- .../INeutronLoadBalancerListenerCRUD.java | 2 +- .../INeutronLoadBalancerPoolAware.java | 2 +- .../INeutronLoadBalancerPoolCRUD.java | 2 +- .../INeutronLoadBalancerPoolMemberAware.java | 2 +- .../INeutronLoadBalancerPoolMemberCRUD.java | 2 +- ...INeutronLoadBalancerPoolMemberRequest.java | 2 +- .../INeutronNetworkAware.java | 2 +- .../INeutronNetworkCRUD.java | 2 +- .../{neutron-spi => spi}/INeutronObject.java | 2 +- .../INeutronPortAware.java | 2 +- .../INeutronPortCRUD.java | 2 +- .../INeutronRouterAware.java | 2 +- .../INeutronRouterCRUD.java | 2 +- .../INeutronSecurityGroupAware.java | 2 +- .../INeutronSecurityGroupCRUD.java | 2 +- .../INeutronSecurityRuleAware.java | 2 +- .../INeutronSecurityRuleCRUD.java | 2 +- .../INeutronSubnetAware.java | 2 +- .../INeutronSubnetCRUD.java | 2 +- .../NeutronCRUDInterfaces.java | 2 +- .../{neutron-spi => spi}/NeutronFirewall.java | 2 +- .../NeutronFirewallPolicy.java | 2 +- .../NeutronFirewallRule.java | 2 +- .../NeutronFloatingIP.java | 2 +- .../NeutronLoadBalancer.java | 2 +- .../NeutronLoadBalancerHealthMonitor.java | 2 +- .../NeutronLoadBalancerListener.java | 2 +- .../NeutronLoadBalancerPool.java | 2 +- .../NeutronLoadBalancerPoolMember.java | 2 +- .../{neutron-spi => spi}/NeutronNetwork.java | 2 +- .../{neutron-spi => spi}/NeutronPort.java | 2 +- .../{neutron-spi => spi}/NeutronRouter.java | 2 +- .../NeutronRouter_Interface.java | 2 +- .../NeutronRouter_NetworkReference.java | 2 +- .../NeutronSecurityGroup.java | 2 +- .../NeutronSecurityRule.java | 2 +- .../{neutron-spi => spi}/NeutronSubnet.java | 2 +- .../NeutronSubnet_HostRoute.java | 2 +- .../NeutronSubnet_IPAllocationPool.java | 2 +- .../{neutron-spi => spi}/Neutron_IPs.java | 2 +- .../api}/BadRequestException.java | 0 .../api}/INeutronRequest.java | 2 +- .../api}/InternalServerErrorException.java | 0 .../api}/NeutronFirewallNorthbound.java | 10 +++---- .../api}/NeutronFirewallPolicyNorthbound.java | 8 +++--- .../api}/NeutronFirewallPolicyRequest.java | 2 +- .../api}/NeutronFirewallRequest.java | 2 +- .../api}/NeutronFirewallRuleRequest.java | 2 +- .../api}/NeutronFirewallRulesNorthbound.java | 10 +++---- .../api}/NeutronFloatingIPRequest.java | 2 +- .../api}/NeutronFloatingIPsNorthbound.java | 22 +++++++-------- ...onLoadBalancerHealthMonitorNorthbound.java | 10 +++---- ...utronLoadBalancerHealthMonitorRequest.java | 2 +- ...NeutronLoadBalancerListenerNorthbound.java | 8 +++--- .../NeutronLoadBalancerListenerRequest.java | 2 +- .../api}/NeutronLoadBalancerNorthbound.java | 8 +++--- .../NeutronLoadBalancerPoolMemberRequest.java | 2 +- ...tronLoadBalancerPoolMembersNorthbound.java | 10 +++---- .../NeutronLoadBalancerPoolNorthbound.java | 10 +++---- .../api}/NeutronLoadBalancerPoolRequest.java | 2 +- .../api}/NeutronLoadBalancerRequest.java | 2 +- .../api}/NeutronNetworkRequest.java | 2 +- .../api}/NeutronNetworksNorthbound.java | 8 +++--- .../api}/NeutronNorthboundRSApplication.java | 0 .../api}/NeutronPageLink.java | 0 .../api}/NeutronPortRequest.java | 2 +- .../api}/NeutronPortsNorthbound.java | 16 +++++------ .../api}/NeutronRouterRequest.java | 2 +- .../api}/NeutronRoutersNorthbound.java | 22 +++++++-------- .../api}/NeutronSecurityGroupRequest.java | 2 +- .../api}/NeutronSecurityGroupsNorthbound.java | 8 +++--- .../api}/NeutronSecurityRuleRequest.java | 2 +- .../api}/NeutronSecurityRulesNorthbound.java | 10 +++---- .../api}/NeutronSubnetRequest.java | 2 +- .../api}/NeutronSubnetsNorthbound.java | 10 +++---- .../api}/NeutronUtil.java | 0 .../api}/PaginatedRequestFactory.java | 8 +++--- .../api}/ResourceConflictException.java | 0 .../api}/ResourceNotFoundException.java | 0 .../api}/RestMessages.java | 0 .../api}/ServiceUnavailableException.java | 0 .../neutron/transcriber/Activator.java | 28 +++++++++---------- .../transcriber/NeutronFirewallInterface.java | 4 +-- .../NeutronFirewallPolicyInterface.java | 4 +-- .../NeutronFirewallRuleInterface.java | 4 +-- .../NeutronFloatingIPInterface.java | 16 +++++------ ...ronLoadBalancerHealthMonitorInterface.java | 4 +-- .../NeutronLoadBalancerInterface.java | 4 +-- .../NeutronLoadBalancerListenerInterface.java | 4 +-- .../NeutronLoadBalancerPoolInterface.java | 4 +-- ...eutronLoadBalancerPoolMemberInterface.java | 4 +-- .../transcriber/NeutronNetworkInterface.java | 4 +-- .../transcriber/NeutronPortInterface.java | 16 +++++------ .../transcriber/NeutronRouterInterface.java | 4 +-- .../NeutronSecurityGroupInterface.java | 4 +-- .../NeutronSecurityRuleInterface.java | 4 +-- .../transcriber/NeutronSubnetInterface.java | 10 +++---- 110 files changed, 217 insertions(+), 217 deletions(-) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronFirewallAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronFirewallCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronFirewallPolicyAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronFirewallPolicyCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronFirewallRuleAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronFirewallRuleCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronFloatingIPAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronFloatingIPCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerHealthMonitorAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerHealthMonitorCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerListenerAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerListenerCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerPoolAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerPoolCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerPoolMemberAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerPoolMemberCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronLoadBalancerPoolMemberRequest.java (96%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronNetworkAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronNetworkCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronObject.java (91%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronPortAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronPortCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronRouterAware.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronRouterCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronSecurityGroupAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronSecurityGroupCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronSecurityRuleAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronSecurityRuleCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronSubnetAware.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/INeutronSubnetCRUD.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronCRUDInterfaces.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronFirewall.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronFirewallPolicy.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronFirewallRule.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronFloatingIP.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronLoadBalancer.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronLoadBalancerHealthMonitor.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronLoadBalancerListener.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronLoadBalancerPool.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronLoadBalancerPoolMember.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronNetwork.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronPort.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronRouter.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronRouter_Interface.java (97%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronRouter_NetworkReference.java (95%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronSecurityGroup.java (98%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronSecurityRule.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronSubnet.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronSubnet_HostRoute.java (95%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/NeutronSubnet_IPAllocationPool.java (99%) rename neutron-spi/src/main/java/org/opendaylight/neutron/{neutron-spi => spi}/Neutron_IPs.java (97%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/BadRequestException.java (100%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/INeutronRequest.java (89%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/InternalServerErrorException.java (100%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronFirewallNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronFirewallPolicyNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronFirewallPolicyRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronFirewallRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronFirewallRuleRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronFirewallRulesNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronFloatingIPRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronFloatingIPsNorthbound.java (96%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerHealthMonitorNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerHealthMonitorRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerListenerNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerListenerRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerPoolMemberRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerPoolMembersNorthbound.java (97%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerPoolNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerPoolRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronLoadBalancerRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronNetworkRequest.java (96%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronNetworksNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronNorthboundRSApplication.java (100%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronPageLink.java (100%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronPortRequest.java (96%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronPortsNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronRouterRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronRoutersNorthbound.java (97%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronSecurityGroupRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronSecurityGroupsNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronSecurityRuleRequest.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronSecurityRulesNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronSubnetRequest.java (96%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronSubnetsNorthbound.java (98%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/NeutronUtil.java (100%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/PaginatedRequestFactory.java (95%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/ResourceConflictException.java (100%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/ResourceNotFoundException.java (100%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/RestMessages.java (100%) rename northbound-api/src/main/java/org/opendaylight/neutron/{northbound-api => northbound/api}/ServiceUnavailableException.java (100%) diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallAware.java index 30acd734c..9e8ee541a 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Firewall Rules needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java index 917108c06..a3ce88c38 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyAware.java index 0c39f5cad..b3f893ab4 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Firewall Policys needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java index f105cb38b..a097037d6 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleAware.java index b23c008e4..770e513d5 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Firewall Rules needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java index 2e3516001..d4fea36a2 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPAware.java index 9e60e7c00..fb1fd45a9 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Neutron FloatingIPs needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java index e799e858c..96f1f700a 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerAware.java index 7609fada7..a311e8f31 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of LoadBalancer Rules needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java index 1efeeae1b..c3c7c94a4 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorAware.java index 8b6117e2b..3c68be3be 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of LoadBalancerHealthMonitor Rules needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java index d59a2637b..51f5e9e98 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerAware.java index 439b33631..84e58c3b6 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of LoadBalancerListener Rules needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java index 4117e7d09..e117deb12 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolAware.java index 2c1b28d5a..284cd2238 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of LoadBalancerPool Rules needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolCRUD.java index 7f188e63c..b2585050b 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberAware.java index bb01bf1e9..634ce3f17 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberAware.java @@ -5,7 +5,7 @@ * 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.neutron.neutron.spi; +package org.opendaylight.neutron.spi; public interface INeutronLoadBalancerPoolMemberAware { diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberCRUD.java index 29f8c9ccd..b228ecbcd 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberRequest.java similarity index 96% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberRequest.java index 3d614c93e..d3933df99 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerPoolMemberRequest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlElement; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkAware.java index 45c9eaa30..ac41d8a63 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Neutron Networks needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java index cda35c484..85184662f 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java similarity index 91% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java index 63280f37b..a6d4bfdb1 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java @@ -8,7 +8,7 @@ * Authors : Dave Tucker */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This class contains behaviour common to Neutron configuration objects diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortAware.java index 2cf2f65ba..f06618c1a 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Neutron Ports needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java index 67c8822bb..4832afc63 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterAware.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterAware.java index 4d08edb36..865ee5311 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Neutron Routers needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java index 0a48fc6bf..c0990caa4 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupAware.java index 3e3f25993..941bac797 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupAware.java @@ -7,7 +7,7 @@ * */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Neutron Security Groups needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java index 73f9edc51..30ecf55fb 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java @@ -7,7 +7,7 @@ * */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleAware.java index 43e1c427f..87e9f1c8f 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleAware.java @@ -7,7 +7,7 @@ * */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods required to be aware of Neutron Security Rules diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java index 118e12531..0877cccbe 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java @@ -7,7 +7,7 @@ * */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetAware.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetAware.java index a39055364..4b8a85513 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetAware.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; /** * This interface defines the methods a service that wishes to be aware of Neutron Subnets needs to implement diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java index 5e27d1fd3..e58070eae 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.util.List; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronCRUDInterfaces.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronCRUDInterfaces.java index c0ce79e17..d62a5ca3d 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronCRUDInterfaces.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java index 4deb8f98c..6e3b62b18 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java index e1ca07539..91d2e375b 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java index 00155d9de..bf8c28d94 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java index 4113578e4..515655003 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; import java.util.Iterator; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java index 9ea27f760..350134122 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java index 775f319c6..774bc0cd7 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java index 48c23bf3a..b88941732 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java index f02875151..a86aa7f17 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java index 28183d654..92f32fb3e 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java index 8acd31c0f..7fbe49367 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; import java.util.ArrayList; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java index 98e5d7f61..d6803bee8 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java index 8051df99d..94bc33edd 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; import java.util.HashMap; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java similarity index 97% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java index 30f29319f..9767104a6 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java similarity index 95% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java index 52b23a881..ee657f8a2 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java similarity index 98% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java index a47529ac0..84d622c87 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java @@ -7,7 +7,7 @@ * */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java index 264dbd663..f975bf7b2 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java @@ -7,7 +7,7 @@ * */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java index 3b5766327..4a12e9aa8 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; import java.net.InetAddress; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_HostRoute.java similarity index 95% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_HostRoute.java index 7b23cdd88..d2bdcb79f 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_HostRoute.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_IPAllocationPool.java similarity index 99% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_IPAllocationPool.java index a0511dc6d..2227cc6d0 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet_IPAllocationPool.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; import java.util.ArrayList; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java similarity index 97% rename from neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java index ba9fb8d39..759e3a303 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.neutron.neutron.spi; +package org.opendaylight.neutron.spi; import java.io.Serializable; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/BadRequestException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/BadRequestException.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/BadRequestException.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/BadRequestException.java diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/INeutronRequest.java similarity index 89% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/INeutronRequest.java index 386351633..dfae6ca3e 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/INeutronRequest.java @@ -10,7 +10,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.INeutronObject; +import org.opendaylight.neutron.spi.INeutronObject; import java.util.List; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/InternalServerErrorException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/InternalServerErrorException.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/InternalServerErrorException.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/InternalServerErrorException.java diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java index b8ca83c64..9a4fdc937 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java @@ -11,11 +11,11 @@ package org.opendaylight.neutron.northbound.api; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallAware; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronFirewall; +import org.opendaylight.neutron.spi.INeutronFirewallAware; +import org.opendaylight.neutron.spi.INeutronFirewallCRUD; +import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronFirewall; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java index 7d16b349b..9a47ae3a6 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java @@ -28,10 +28,10 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyAware; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy; +import org.opendaylight.neutron.spi.INeutronFirewallPolicyAware; +import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronFirewallPolicy; /** * Neutron Northbound REST APIs for Firewall Policies.
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java index 21c89b051..bc2b7d91b 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyRequest.java @@ -8,7 +8,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy; +import org.opendaylight.neutron.spi.NeutronFirewallPolicy; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java index 4e8f56743..d0429ba16 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRequest.java @@ -8,7 +8,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronFirewall; +import org.opendaylight.neutron.spi.NeutronFirewall; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java index ff6b3240d..26e0b297d 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRuleRequest.java @@ -8,7 +8,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule; +import org.opendaylight.neutron.spi.NeutronFirewallRule; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java index 3ea9f61e3..a6dcbcebc 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java @@ -28,11 +28,11 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleAware; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule; +import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD; +import org.opendaylight.neutron.spi.INeutronFirewallRuleAware; +import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronFirewallRule; /** * Neutron Northbound REST APIs for Firewall Rule.
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPRequest.java index 31463b7b3..be420c7f3 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPRequest.java @@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP; +import org.opendaylight.neutron.spi.NeutronFloatingIP; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPsNorthbound.java similarity index 96% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPsNorthbound.java index a9749dd6b..59ccfd268 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIPsNorthbound.java @@ -26,17 +26,17 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPAware; -import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP; -import org.opendaylight.neutron.neutron.spi.NeutronNetwork; -import org.opendaylight.neutron.neutron.spi.NeutronPort; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; -import org.opendaylight.neutron.neutron.spi.Neutron_IPs; +import org.opendaylight.neutron.spi.INeutronFloatingIPAware; +import org.opendaylight.neutron.spi.INeutronFloatingIPCRUD; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.INeutronPortCRUD; +import org.opendaylight.neutron.spi.INeutronSubnetCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronFloatingIP; +import org.opendaylight.neutron.spi.NeutronNetwork; +import org.opendaylight.neutron.spi.NeutronPort; +import org.opendaylight.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.Neutron_IPs; /** * Neutron Northbound REST APIs.
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java index 55594500c..863059717 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java @@ -28,11 +28,11 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorAware; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor; +import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorAware; +import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronLoadBalancer; +import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java index 903648c5f..de2da47cd 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorRequest.java @@ -8,7 +8,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor; +import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java index 6949bf547..df627185d 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java @@ -28,10 +28,10 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerAware; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener; +import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerAware; +import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronLoadBalancerListener; /** * Neutron Northbound REST APIs for LoadBalancerListener Policies.
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java index 8812eb099..9a6cabe94 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerRequest.java @@ -8,7 +8,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener; +import org.opendaylight.neutron.spi.NeutronLoadBalancerListener; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java index f4a1100fa..82d6800da 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java @@ -28,10 +28,10 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerAware; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer; +import org.opendaylight.neutron.spi.INeutronLoadBalancerAware; +import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronLoadBalancer; /** * Neutron Northbound REST APIs for LoadBalancers.
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java index ac5499580..0bd22d7f8 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMemberRequest.java @@ -7,7 +7,7 @@ */ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember; +import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember; import javax.xml.bind.annotation.XmlElement; import java.util.List; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java similarity index 97% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java index 2a4113d2a..d6f97bb84 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java @@ -28,11 +28,11 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberAware; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember; +import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD; +import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolMemberAware; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronLoadBalancerPool; +import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember; @Path("/pools/{loadBalancerPoolUUID}/members") public class NeutronLoadBalancerPoolMembersNorthbound { diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java index 2e38e1893..ac3dc44e3 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java @@ -30,11 +30,11 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolAware; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember; +import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolAware; +import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronLoadBalancerPool; +import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember; /** * Neutron Northbound REST APIs for LoadBalancerPool Policies.
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java index 505529e04..825e05728 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolRequest.java @@ -8,7 +8,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool; +import org.opendaylight.neutron.spi.NeutronLoadBalancerPool; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java index 337fe501b..9f69380c0 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerRequest.java @@ -8,7 +8,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer; +import org.opendaylight.neutron.spi.NeutronLoadBalancer; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java similarity index 96% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java index c5e8cf3f9..8a2628fde 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworkRequest.java @@ -13,7 +13,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.neutron.neutron.spi.NeutronNetwork; +import org.opendaylight.neutron.spi.NeutronNetwork; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java index b1497772b..5aa5ed377 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java @@ -31,10 +31,10 @@ import javax.ws.rs.core.UriInfo; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; import org.codehaus.enunciate.jaxrs.TypeHint; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkAware; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronNetwork; +import org.opendaylight.neutron.spi.INeutronNetworkAware; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronNetwork; /** * Neutron Northbound REST APIs for Network.
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNorthboundRSApplication.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNorthboundRSApplication.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPageLink.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPageLink.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPageLink.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPageLink.java diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java similarity index 96% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java index 1b1833fcb..31d95355f 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortRequest.java @@ -13,7 +13,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.neutron.neutron.spi.NeutronPort; +import org.opendaylight.neutron.spi.NeutronPort; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java index f8f738694..4f4495d29 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java @@ -10,14 +10,14 @@ package org.opendaylight.neutron.northbound.api; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronPortAware; -import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronPort; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; -import org.opendaylight.neutron.neutron.spi.Neutron_IPs; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.INeutronPortAware; +import org.opendaylight.neutron.spi.INeutronPortCRUD; +import org.opendaylight.neutron.spi.INeutronSubnetCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronPort; +import org.opendaylight.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.Neutron_IPs; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java index d493b004a..16ddbda8c 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRouterRequest.java @@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.neutron.neutron.spi.NeutronRouter; +import org.opendaylight.neutron.spi.NeutronRouter; @XmlRootElement diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java similarity index 97% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java index 025eb3486..fec761ff4 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java @@ -26,17 +26,17 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronRouterAware; -import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronNetwork; -import org.opendaylight.neutron.neutron.spi.NeutronPort; -import org.opendaylight.neutron.neutron.spi.NeutronRouter; -import org.opendaylight.neutron.neutron.spi.NeutronRouter_Interface; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.INeutronPortCRUD; +import org.opendaylight.neutron.spi.INeutronRouterAware; +import org.opendaylight.neutron.spi.INeutronRouterCRUD; +import org.opendaylight.neutron.spi.INeutronSubnetCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronNetwork; +import org.opendaylight.neutron.spi.NeutronPort; +import org.opendaylight.neutron.spi.NeutronRouter; +import org.opendaylight.neutron.spi.NeutronRouter_Interface; +import org.opendaylight.neutron.spi.NeutronSubnet; /** diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java index c70b8577b..74d040231 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java @@ -9,7 +9,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup; +import org.opendaylight.neutron.spi.NeutronSecurityGroup; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java index 1a782d7d7..89259314c 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java @@ -29,10 +29,10 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupAware; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup; +import org.opendaylight.neutron.spi.INeutronSecurityGroupAware; +import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronSecurityGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java index f467d5872..016af7b90 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java @@ -9,7 +9,7 @@ package org.opendaylight.neutron.northbound.api; -import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule; +import org.opendaylight.neutron.spi.NeutronSecurityRule; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java index bdf12d7eb..9f9e97699 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java @@ -29,11 +29,11 @@ import javax.ws.rs.core.Response; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleAware; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule; +import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD; +import org.opendaylight.neutron.spi.INeutronSecurityRuleAware; +import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronSecurityRule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java similarity index 96% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java index ac994f676..84716f267 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetRequest.java @@ -13,7 +13,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.NeutronSubnet; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java similarity index 98% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java index eb3da1d23..8a98b2652 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java @@ -31,11 +31,11 @@ import javax.ws.rs.core.UriInfo; import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetAware; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.INeutronSubnetAware; +import org.opendaylight.neutron.spi.INeutronSubnetCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronSubnet; /** * Neutron Northbound REST APIs for Subnets.
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronUtil.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronUtil.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronUtil.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronUtil.java diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java similarity index 95% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java index b4650533c..95ff0ebe8 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java @@ -16,10 +16,10 @@ import java.util.Comparator; import java.util.List; import javax.ws.rs.core.UriInfo; -import org.opendaylight.neutron.neutron.spi.INeutronObject; -import org.opendaylight.neutron.neutron.spi.NeutronNetwork; -import org.opendaylight.neutron.neutron.spi.NeutronPort; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.INeutronObject; +import org.opendaylight.neutron.spi.NeutronNetwork; +import org.opendaylight.neutron.spi.NeutronPort; +import org.opendaylight.neutron.spi.NeutronSubnet; public class PaginatedRequestFactory { private static final Comparator NEUTRON_OBJECT_COMPARATOR = new Comparator() { diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceConflictException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ResourceConflictException.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceConflictException.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ResourceConflictException.java diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceNotFoundException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ResourceNotFoundException.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceNotFoundException.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ResourceNotFoundException.java diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/RestMessages.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/RestMessages.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/RestMessages.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/RestMessages.java diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ServiceUnavailableException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ServiceUnavailableException.java similarity index 100% rename from northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ServiceUnavailableException.java rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/ServiceUnavailableException.java diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java index bdf4ad31d..97e7a422d 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java @@ -11,20 +11,20 @@ package org.opendaylight.neutron.transcriber; import java.util.ArrayList; import java.util.List; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD; +import org.opendaylight.neutron.spi.INeutronFirewallCRUD; +import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD; +import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD; +import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD; +import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD; +import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD; +import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD; +import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolMemberCRUD; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.INeutronPortCRUD; +import org.opendaylight.neutron.spi.INeutronRouterCRUD; +import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD; +import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD; +import org.opendaylight.neutron.spi.INeutronSubnetCRUD; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java index 13b485312..5145196a8 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java @@ -8,8 +8,8 @@ package org.opendaylight.neutron.transcriber; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronFirewall; +import org.opendaylight.neutron.spi.INeutronFirewallCRUD; +import org.opendaylight.neutron.spi.NeutronFirewall; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java index 11fa6074d..c55165d94 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java @@ -8,8 +8,8 @@ package org.opendaylight.neutron.transcriber; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy; +import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD; +import org.opendaylight.neutron.spi.NeutronFirewallPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java index 0259497e6..df4eeb010 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java @@ -8,8 +8,8 @@ package org.opendaylight.neutron.transcriber; -import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule; +import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD; +import org.opendaylight.neutron.spi.NeutronFirewallRule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java index 74ea59e1c..ba62cda70 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java @@ -17,14 +17,14 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP; -import org.opendaylight.neutron.neutron.spi.NeutronPort; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.INeutronFloatingIPCRUD; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.INeutronPortCRUD; +import org.opendaylight.neutron.spi.INeutronSubnetCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronFloatingIP; +import org.opendaylight.neutron.spi.NeutronPort; +import org.opendaylight.neutron.spi.NeutronSubnet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java index ef9e8f587..f1aa94928 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java @@ -8,8 +8,8 @@ package org.opendaylight.neutron.transcriber; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor; +import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD; +import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java index 845ff4b7c..6599d907a 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java @@ -8,8 +8,8 @@ package org.opendaylight.neutron.transcriber; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer; +import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD; +import org.opendaylight.neutron.spi.NeutronLoadBalancer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java index f20b48159..95ca3494b 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java @@ -8,8 +8,8 @@ package org.opendaylight.neutron.transcriber; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener; +import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD; +import org.opendaylight.neutron.spi.NeutronLoadBalancerListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java index 4b0274c58..13a93fc0a 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java @@ -8,8 +8,8 @@ package org.opendaylight.neutron.transcriber; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool; +import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD; +import org.opendaylight.neutron.spi.NeutronLoadBalancerPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java index 97c0ea801..ae3cac057 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java @@ -8,8 +8,8 @@ package org.opendaylight.neutron.transcriber; -import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember; +import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolMemberCRUD; +import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java index 45257eaae..043766254 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java @@ -17,8 +17,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronNetwork; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.NeutronNetwork; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java index e0cf8cf49..8e709bc3a 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java @@ -18,14 +18,14 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronNetwork; -import org.opendaylight.neutron.neutron.spi.NeutronPort; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; -import org.opendaylight.neutron.neutron.spi.Neutron_IPs; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.INeutronPortCRUD; +import org.opendaylight.neutron.spi.INeutronSubnetCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronNetwork; +import org.opendaylight.neutron.spi.NeutronPort; +import org.opendaylight.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.Neutron_IPs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java index 8767f99a2..0dc168d0e 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java @@ -17,8 +17,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronRouter; +import org.opendaylight.neutron.spi.INeutronRouterCRUD; +import org.opendaylight.neutron.spi.NeutronRouter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java index d3da70c10..4f20a7262 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java @@ -18,8 +18,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup; +import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD; +import org.opendaylight.neutron.spi.NeutronSecurityGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java index d9c7b5735..f0b171ffe 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java @@ -18,8 +18,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule; +import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD; +import org.opendaylight.neutron.spi.NeutronSecurityRule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java index 761077184..5e8f585ad 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java @@ -17,11 +17,11 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD; -import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD; -import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces; -import org.opendaylight.neutron.neutron.spi.NeutronNetwork; -import org.opendaylight.neutron.neutron.spi.NeutronSubnet; +import org.opendaylight.neutron.spi.INeutronNetworkCRUD; +import org.opendaylight.neutron.spi.INeutronSubnetCRUD; +import org.opendaylight.neutron.spi.NeutronCRUDInterfaces; +import org.opendaylight.neutron.spi.NeutronNetwork; +import org.opendaylight.neutron.spi.NeutronSubnet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -- 2.36.6