You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/17 02:11:27 UTC
[3/3] git commit: updated refs/heads/internallb to 501f2ff
InternalLb: validate source ip network as a part of LB rule creation
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/501f2ffa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/501f2ffa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/501f2ffa
Branch: refs/heads/internallb
Commit: 501f2ffa0b07e80c17e4d6f7a73721d034c8e46a
Parents: 4d9a7df
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Apr 16 17:03:50 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Apr 16 17:03:50 2013 -0700
----------------------------------------------------------------------
.../lb/ApplicationLoadBalancerManagerImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/501f2ffa/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
index ca7b851..65ce45e 100644
--- a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
+++ b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
@@ -129,13 +129,16 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A
//2) verify that lb service is supported by the network
_lbMgr.isLbServiceSupportedInNetwork(guestNtwk.getId(), scheme);
- //3) Get source ip address
+ //3) Validate source network
+ validateSourceIpNtwkForLbRule(sourceIpNtwk, scheme);
+
+ //4) Get source ip address
sourceIp = getSourceIp(scheme, sourceIpNtwk, sourceIp);
ApplicationLoadBalancerRuleVO newRule = new ApplicationLoadBalancerRuleVO(name, description, sourcePort, instancePort, algorithm, guestNtwk.getId(),
lbOwner.getId(), lbOwner.getDomainId(), new Ip(sourceIp), sourceIpNtwk.getId(), scheme);
- //4) Validate Load Balancing rule on the providers
+ //5) Validate Load Balancing rule on the providers
LoadBalancingRule loadBalancing = new LoadBalancingRule(newRule, new ArrayList<LbDestination>(),
new ArrayList<LbStickinessPolicy>(), new ArrayList<LbHealthCheckPolicy>(), new Ip(sourceIp));
if (!_lbMgr.validateLbRule(loadBalancing)) {
@@ -303,7 +306,10 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A
* @param requestedSourceIp
*/
private void validateRequestedSourceIpForInternalLbRule(Network sourceIpNtwk, Ip requestedSourceIp) {
- //Check if the IP address used by the load balancer or other nics
+ //1) FIXME - Check if the IP is within the network cidr
+
+
+ //2) Check if the IP address used by the load balancer or other nics
if (_lbDao.countBySourceIp(requestedSourceIp, sourceIpNtwk.getId()) > 0) {
s_logger.debug("IP address " + requestedSourceIp.addr() + " is already used by existing LB rule, skipping the validation");
return;