From 623f3b26cadac24caf8434d5b570788bf444d8cb Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 17 Aug 2012 20:37:30 +0530 Subject: [PATCH] CS-15830. If autoscale vm group creation is attempted on a unimplemented network an error is thrown. Enhancing the check to make sure AutoScaleVmGroup should have atleast 1 min member. --- server/src/com/cloud/network/as/AutoScaleManagerImpl.java | 2 +- .../com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 460e8a4e159..980b06de653 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -843,7 +843,7 @@ public class AutoScaleManagerImpl implements AutoScaleService, Manager { if(vmGroup.getCreated() != null) ApiDBUtils.getAutoScaleVmGroupPolicyIds(vmGroup.getId(), bakupScaleUpPolicyIds, bakupScaleDownPolicyIds); - if (minMembers < 0) { + if (minMembers < 1) { throw new InvalidParameterValueException(ApiConstants.MIN_MEMBERS + " is an invalid value: " + minMembers, null); } diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index bda4a92741b..c75548da715 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -286,6 +286,11 @@ public class LoadBalancingRulesManagerImpl implements LoadBalancingRulesMa if (zone.getNetworkType() == NetworkType.Advanced) { NetworkVO lbNetwork = _networkDao.findById(lbNetworkId); lbNetworkUuid = lbNetwork.getUuid(); + if (vmGroup.getState().equals(AutoScaleVmGroup.State_New)) { + if(!lbNetwork.getState().equals(Network.State.Implemented)) { + throw new InvalidParameterValueException("Network is not in implemented state", null); + } + } } }