Internal LB: Made InternalLbElement to extend the ip deployer as the LB service implements IPDeployerRequester
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d40e6d89 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d40e6d89 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d40e6d89 Branch: refs/heads/internallb Commit: d40e6d8911a97a783aaa653e4345c9c42687d885 Parents: 4093fda Author: Alena Prokharchyk <alena.prokharc...@citrix.com> Authored: Tue Apr 9 17:51:19 2013 -0700 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Tue Apr 9 17:55:59 2013 -0700 ---------------------------------------------------------------------- .../element/InternalLoadBalancerElement.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d40e6d89/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java ---------------------------------------------------------------------- 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 816278a..610e5d5 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 @@ -44,6 +44,7 @@ import com.cloud.network.Network.Service; import com.cloud.network.NetworkModel; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetworkServiceProvider; +import com.cloud.network.PublicIpAddress; import com.cloud.network.VirtualRouterProvider; import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType; import com.cloud.network.dao.NetworkServiceMapDao; @@ -70,7 +71,7 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.DomainRouterDao; @Local(value = {NetworkElement.class}) -public class InternalLoadBalancerElement extends AdapterBase implements LoadBalancingServiceProvider, InternalLoadBalancerElementService{ +public class InternalLoadBalancerElement extends AdapterBase implements LoadBalancingServiceProvider, InternalLoadBalancerElementService, IpDeployer{ private static final Logger s_logger = Logger.getLogger(InternalLoadBalancerElement.class); protected static final Map<Service, Map<Capability, String>> capabilities = setCapabilities(); @@ -171,7 +172,7 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala @Override public IpDeployer getIpDeployer(Network network) { - return null; + return this; } @Override @@ -288,4 +289,10 @@ public class InternalLoadBalancerElement extends AdapterBase implements LoadBala return sc.list(); } + @Override + public boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress, Set<Service> services) throws ResourceUnavailableException { + //do nothing here; this element just has to extend the ip deployer as the LB service implements IPDeployerRequester + return true; + } + }
