cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject git commit: updated refs/heads/master to 778e04c
Date Mon, 14 Jul 2014 14:21:32 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 1ed554650 -> 778e04cb7


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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/778e04cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/778e04cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/778e04cb

Branch: refs/heads/master
Commit: 778e04cb7754c770d64fa76c8f330fa47e28ed65
Parents: 1ed5546
Author: Jayapal <jayapal@apache.org>
Authored: Mon Jul 14 17:35:59 2014 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Mon Jul 14 19:50:36 2014 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/IpAddressManagerImpl.java          | 5 +++++
 .../src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/778e04cb/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 9906e06..c454968 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<PublicIp>
publicIps) {
+
+        if (network.getState() == Network.State.Implementing) {
+            return true;
+        }
+
         for (PublicIp ip : publicIps) {
             if (ip.isSourceNat()) {
                 continue;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/778e04cb/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 227a72c..9238f50 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<Type> 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.


Mime
View raw message