Bug-Id: CLOUDSTACK-7395: reverted 0560254c04425705530a23a93002daede4b6dc3c partially. Allow multiple networks with LB service
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a5203091 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a5203091 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a5203091 Branch: refs/heads/vmware-disk-controllers Commit: a5203091902f2be033663358b8d5083b6488b879 Parents: dc17e4e Author: Kishan Kavala <kis...@apache.org> Authored: Mon Dec 15 17:18:09 2014 +0530 Committer: Kishan Kavala <kis...@apache.org> Committed: Wed Jan 7 14:33:31 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5203091/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index fbb94c7..6bc75e4 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1309,9 +1309,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis continue; } else { NetworkOffering otherOff = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId()); - //throw only if networks have different offerings with public lb support - if (_ntwkModel.areServicesSupportedInNetwork(network.getId(), Service.Lb) && otherOff.getPublicLb() && - guestNtwkOff.getId() != otherOff.getId()) { + if (_ntwkModel.areServicesSupportedInNetwork(network.getId(), Service.Lb) && otherOff.getPublicLb()) { throw new InvalidParameterValueException("Public LB service is already supported " + "by network " + network + " in VPC " + vpc); } }
