From a3321ce617eab795288ab75357345d45794db93d Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 18 Apr 2013 13:31:16 -0700 Subject: [PATCH] Internal LB : renamed the classes responsible for managing internal lb elements. Now the names are InternalLoadBalancerVMManager, InternalLoadBalancerVMService and InternalLoadBalancerVMManagerImpl --- api/src/org/apache/cloudstack/api/BaseCmd.java | 4 ++-- ...cerService.java => InternalLoadBalancerVMService.java} | 2 +- client/tomcatconf/applicationContext.xml.in | 2 +- .../network/element/InternalLoadBalancerElement.java | 4 ++-- ...cerManager.java => InternalLoadBalancerVMManager.java} | 2 +- ...erImpl.java => InternalLoadBalancerVMManagerImpl.java} | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename api/src/org/apache/cloudstack/network/lb/{InternalLoadBalancerService.java => InternalLoadBalancerVMService.java} (96%) rename plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/{InternalLoadBalancerManager.java => InternalLoadBalancerVMManager.java} (96%) rename plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/{InternalLoadBalancerManagerImpl.java => InternalLoadBalancerVMManagerImpl.java} (99%) diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java index beebe5b0053..e66e5226b67 100644 --- a/api/src/org/apache/cloudstack/api/BaseCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseCmd.java @@ -30,7 +30,7 @@ import javax.inject.Inject; import org.apache.cloudstack.affinity.AffinityGroupService; import org.apache.cloudstack.network.element.InternalLoadBalancerElementService; import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService; -import org.apache.cloudstack.network.lb.InternalLoadBalancerService; +import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService; import org.apache.cloudstack.query.QueryService; import org.apache.cloudstack.usage.UsageService; import org.apache.log4j.Logger; @@ -142,7 +142,7 @@ public abstract class BaseCmd { @Inject public ApplicationLoadBalancerService _appLbService; @Inject public AffinityGroupService _affinityGroupService; @Inject public InternalLoadBalancerElementService _internalLbElementSvc; - @Inject public InternalLoadBalancerService _internalLbSvc; + @Inject public InternalLoadBalancerVMService _internalLbSvc; public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException; diff --git a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerService.java b/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java similarity index 96% rename from api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerService.java rename to api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java index f9089364ee8..91cd88d91c1 100644 --- a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerService.java +++ b/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java @@ -23,7 +23,7 @@ import com.cloud.exception.StorageUnavailableException; import com.cloud.network.router.VirtualRouter; import com.cloud.user.Account; -public interface InternalLoadBalancerService { +public interface InternalLoadBalancerVMService { VirtualRouter startInternalLbVm(long internalLbVmId, Account caller, long callerUserId) throws StorageUnavailableException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException; diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 16171670f99..84a7f50e592 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -792,7 +792,7 @@ - + diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java index 2d10e51ef6e..3857730c146 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java @@ -30,7 +30,7 @@ import javax.inject.Inject; import org.apache.cloudstack.api.command.admin.internallb.ConfigureInternalLoadBalancerElementCmd; import org.apache.cloudstack.api.command.admin.internallb.CreateInternalLoadBalancerElementCmd; import org.apache.cloudstack.api.command.admin.internallb.ListInternalLoadBalancerElementsCmd; -import org.apache.cloudstack.network.lb.InternalLoadBalancerManager; +import org.apache.cloudstack.network.lb.InternalLoadBalancerVMManager; import org.apache.cloudstack.network.lb.dao.ApplicationLoadBalancerRuleDao; import org.apache.log4j.Logger; @@ -95,7 +95,7 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala @Inject DomainRouterDao _routerDao; @Inject VirtualRouterProviderDao _vrProviderDao; @Inject PhysicalNetworkServiceProviderDao _pNtwkSvcProviderDao; - @Inject InternalLoadBalancerManager _internalLbMgr; + @Inject InternalLoadBalancerVMManager _internalLbMgr; @Inject ConfigurationManager _configMgr; @Inject AccountManager _accountMgr; @Inject ApplicationLoadBalancerRuleDao _appLbDao; diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManager.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java similarity index 96% rename from plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManager.java rename to plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java index c3cccb3fdb3..351e0211864 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManager.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java @@ -31,7 +31,7 @@ import com.cloud.utils.component.Manager; import com.cloud.utils.net.Ip; import com.cloud.vm.VirtualMachineProfile.Param; -public interface InternalLoadBalancerManager extends Manager, InternalLoadBalancerService{ +public interface InternalLoadBalancerVMManager extends Manager, InternalLoadBalancerVMService{ /** * Destroys Internal LB vm instance * @param vmId diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java similarity index 99% rename from plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManagerImpl.java rename to plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java index 2471c49521c..8a4922bdb90 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerManagerImpl.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java @@ -117,11 +117,11 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; @Component -@Local(value = { InternalLoadBalancerManager.class, InternalLoadBalancerService.class}) -public class InternalLoadBalancerManagerImpl extends ManagerBase implements -InternalLoadBalancerManager, VirtualMachineGuru { +@Local(value = { InternalLoadBalancerVMManager.class, InternalLoadBalancerVMService.class}) +public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements +InternalLoadBalancerVMManager, VirtualMachineGuru { private static final Logger s_logger = Logger - .getLogger(InternalLoadBalancerManagerImpl.class); + .getLogger(InternalLoadBalancerVMManagerImpl.class); private String _instance; private String _mgmtHost; private String _mgmtCidr;