You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2014/10/13 06:41:31 UTC
[14/50] [abbrv] git commit: updated refs/heads/4.5 to 50ee981
ccp should not check public ip resource when deploy a vm on shared network
(cherry picked from commit 3201251256817a44b4046c77c170fa82267e3fc3)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba186283
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba186283
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba186283
Branch: refs/heads/4.5
Commit: ba1862836e48449e21b2346694bc448b78491c42
Parents: a9761a3
Author: Anthony Xu <an...@citrix.com>
Authored: Thu Oct 2 16:02:33 2014 -0700
Committer: David Nalley <da...@gnsa.us>
Committed: Mon Oct 13 00:27:01 2014 -0400
----------------------------------------------------------------------
server/src/com/cloud/network/IpAddressManagerImpl.java | 2 +-
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba186283/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 1f78966..016d297 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -758,7 +758,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
assert (addrs.size() == 1) : "Return size is incorrect: " + addrs.size();
- if (!fetchFromDedicatedRange) {
+ if (!fetchFromDedicatedRange && VlanType.VirtualNetwork.equals(vlanUse)) {
// Check that the maximum number of public IPs for the given accountId will not be exceeded
try {
_resourceLimitMgr.checkResourceLimit(owner, ResourceType.public_ip);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba186283/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index b6977c2..63150eb 100755
--- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -425,7 +425,9 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
"Maximum number of resources of type '" + type + "' for project name=" + projectFinal.getName() + " in domain id=" + account.getDomainId() +
" has been exceeded.";
}
- throw new ResourceAllocationException(message, type);
+ ResourceAllocationException e= new ResourceAllocationException(message, type);;
+ s_logger.error(message, e);
+ throw e;
}
// check all domains in the account's domain hierarchy