CLOUDSTACK-7104: perform ipassoc for ip when network is implemented after the gc

Jayapal · Jayapal · commit 778e04cb7754 · 2014-07-14T19:50:36.000+05:30
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -420,6 +420,11 @@ private IpAddress allocateIP(Account ipOwner, boolean isSystem, long zoneId) thr
     //  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<PublicIp> 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
@@ -1137,7 +1137,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                 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.
