You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/06/27 00:34:50 UTC
[2/4] git commit: updated refs/heads/master-6-17-stable to ff33a35
Update resource count for networks only when the network is non system and Isolated. Before we used to update the count only when offering had specifyVlan=false. And in 4.2 even isolated networks can have this attribute set to true, and we have to count them
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/44e65955
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44e65955
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44e65955
Branch: refs/heads/master-6-17-stable
Commit: 44e6595598ace2ba46e0e29ec547aa11fab3d047
Parents: 3cff898
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Jun 25 13:31:29 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Jun 26 15:27:40 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkManagerImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44e65955/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 67f08ee..41054ec 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2867,7 +2867,9 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
}
private boolean resourceCountNeedsUpdate(NetworkOffering ntwkOff, ACLType aclType) {
- boolean updateResourceCount = (!ntwkOff.getSpecifyVlan() && aclType == ACLType.Account);
+ //Update resource count only for Isolated account specific non-system networks
+ boolean updateResourceCount = (ntwkOff.getGuestType() == GuestType.Isolated &&
+ !ntwkOff.isSystemOnly() && aclType == ACLType.Account);
return updateResourceCount;
}