From 09d9bacce4da6cda8a9bb4ab8be12ede898a9a37 Mon Sep 17 00:00:00 2001 From: Deepti Dohare Date: Thu, 5 Jul 2012 11:00:19 +0530 Subject: [PATCH] CS-15429: Create Instance should fail if creating instance results in exceeding volume resource limit for domain-admin or user accounts Reviewed-by: devdeep.singh@citrix.com Change: Adding a check for diskOfferingId --- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 63b85a573bc..36eea2940f5 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2234,7 +2234,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager // check if account/domain is with in resource limits to create a new vm _resourceLimitMgr.checkResourceLimit(owner, ResourceType.user_vm); - _resourceLimitMgr.checkResourceLimit(owner, ResourceType.volume); + _resourceLimitMgr.checkResourceLimit(owner, ResourceType.volume, (diskOfferingId == null ? 1 : 2)); //verify security group ids if (securityGroupIdList != null) {