From 34a36b7009bbbb3e5100ec3188601dff8ef8393c Mon Sep 17 00:00:00 2001
From: Murali Reddy <murali@cloud.com>
Date: Wed, 22 Jun 2011 13:00:59 +0530
Subject: [PATCH] Bug 10012: Vague error event created when user attempted to
 exceed limit set for a given resource status 10012: resolved fixed

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 1 +
 server/src/com/cloud/storage/StorageManagerImpl.java | 1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 6611d273bd8..aa0ba62be09 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -570,6 +570,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
             // Check that the maximum number of public IPs for the given
             // accountId will not be exceeded
             if (_accountMgr.resourceLimitExceeded(accountToLock, ResourceType.public_ip)) {
+                UserContext.current().setEventDetails("Maximum number of public IP addresses for account: " + accountToLock.getAccountName() + " has been exceeded.");
                 ResourceAllocationException rae = new ResourceAllocationException("Maximum number of public IP addresses for account: " + accountToLock.getAccountName() + " has been exceeded.");
                 rae.setResourceType("ip");
                 throw rae;
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index f8be4abf1c9..686a4b14318 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1580,6 +1580,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
         // check if the volume can be created for the user
         // Check that the resource limit for volumes won't be exceeded
         if (_accountMgr.resourceLimitExceeded(targetAccount, ResourceType.volume)) {
+            UserContext.current().setEventDetails("Maximum number of volumes for account: " + targetAccount.getAccountName() + " has been exceeded.");
             ResourceAllocationException rae = new ResourceAllocationException("Maximum number of volumes for account: " + targetAccount.getAccountName() + " has been exceeded.");
             rae.setResourceType("volume");
             throw rae;
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 91ce5af05bc..7e27e49943a 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2316,6 +2316,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
 
         // check if account/domain is with in resource limits to create a new vm
         if (_accountMgr.resourceLimitExceeded(owner, ResourceType.user_vm)) {
+            UserContext.current().setEventDetails("Maximum number of virtual machines for account: " + owner.getAccountName() + " has been exceeded.");
             ResourceAllocationException rae = new ResourceAllocationException("Maximum number of virtual machines for account: " + owner.getAccountName() + " has been exceeded.");
             rae.setResourceType("vm");
             throw rae;