diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java index 9906e0635a1..c45496879f5 100644 --- a/server/src/com/cloud/network/IpAddressManagerImpl.java +++ b/server/src/com/cloud/network/IpAddressManagerImpl.java @@ -420,6 +420,11 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage // 1.there is at least one public IP associated with the network on which first rule (PF/static NAT/LB) is being applied. // 2.last rule (PF/static NAT/LB) on the public IP has been revoked. So the public IP should not be associated with any provider boolean checkIfIpAssocRequired(Network network, boolean postApplyRules, List publicIps) { + + if (network.getState() == Network.State.Implementing) { + return true; + } + for (PublicIp ip : publicIps) { if (ip.isSourceNat()) { continue; diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 227a72c494e..9238f50f19e 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -1137,7 +1137,7 @@ public class LoadBalancingRulesManagerImpl extends ManagerBase implements loadBalancer.setState(backupState); _lbDao.persist(loadBalancer); CloudRuntimeException ex = new CloudRuntimeException("Failed to add specified loadbalancerruleid for vms " - + instanceIds); + + vmInstanceIds); ex.addProxyObject(loadBalancer.getUuid(), "loadBalancerId"); // TBD: Also pack in the instanceIds in the exception using the // right VO object or table name.