Bug-Id: CLOUDSTACK-7395: reverted 0560254 partially. Allow multiple networks with LB service

kishankavala · kishankavala · commit a5203091902f · 2015-01-07T14:33:31.000+05:30
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1309,9 +1309,7 @@ public void validateNtwkOffForNtwkInVpc(Long networkId, long newNtwkOffId, Strin
                     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);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1309,9 +1309,7 @@ public void validateNtwkOffForNtwkInVpc(Long networkId, long newNtwkOffId, Strin`
`1309`	`1309`	`continue;`
`1310`	`1310`	`} else {`
`1311`	`1311`	`NetworkOffering otherOff = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId());`
`1312`		`- //throw only if networks have different offerings with public lb support`
`1313`		`- if (_ntwkModel.areServicesSupportedInNetwork(network.getId(), Service.Lb) && otherOff.getPublicLb() &&`
`1314`		`- guestNtwkOff.getId() != otherOff.getId()) {`
	`1312`	`+ if (_ntwkModel.areServicesSupportedInNetwork(network.getId(), Service.Lb) && otherOff.getPublicLb()) {`
`1315`	`1313`	`throw new InvalidParameterValueException("Public LB service is already supported " + "by network " + network + " in VPC " + vpc);`
`1316`	`1314`	`}`
`1317`	`1315`	`}`