From 86398a85462ea5653f2b368071ed7de89c247f4d Mon Sep 17 00:00:00 2001
From: Murali Reddy <murali@cloud.com>
Date: Wed, 2 Feb 2011 02:40:26 -0800
Subject: [PATCH] bug 8290: Instance Limit set at account level however was
 able to create more vms than limit adding additional exception handling

---
 api/src/com/cloud/api/commands/DeployVMCmd.java | 8 ++++++--
 api/src/com/cloud/api/commands/StartVMCmd.java  | 6 +++++-
 api/src/com/cloud/vm/UserVmService.java         | 4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/api/src/com/cloud/api/commands/DeployVMCmd.java b/api/src/com/cloud/api/commands/DeployVMCmd.java
index 1f204c30588..6c7555ce105 100644
--- a/api/src/com/cloud/api/commands/DeployVMCmd.java
+++ b/api/src/com/cloud/api/commands/DeployVMCmd.java
@@ -33,6 +33,7 @@ import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.user.Account;
@@ -244,7 +245,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
             s_logger.info(ex);
             s_logger.trace(ex);
             throw new ServerApiException(BaseCmd.INSUFFICIENT_CAPACITY_ERROR, ex.getMessage());
-        } 
+		}       
     }
 
     @Override
@@ -266,7 +267,10 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
         }  catch (ConcurrentOperationException ex) {
             s_logger.warn("Exception: ", ex);
             throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage());
-        } 
+        } catch (ResourceAllocationException ex) {
+		    s_logger.warn("Exception: ", ex);
+		    throw new ServerApiException(BaseCmd.RESOURCE_ALLOCATION_ERROR, ex.getMessage());
+        }    
     }
 
 }
diff --git a/api/src/com/cloud/api/commands/StartVMCmd.java b/api/src/com/cloud/api/commands/StartVMCmd.java
index 533ac77aec1..54f7b4e69a7 100644
--- a/api/src/com/cloud/api/commands/StartVMCmd.java
+++ b/api/src/com/cloud/api/commands/StartVMCmd.java
@@ -30,6 +30,7 @@ import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.StorageUnavailableException;
 import com.cloud.user.Account;
@@ -118,6 +119,9 @@ public class StartVMCmd extends BaseAsyncCmd {
         }catch (ExecutionException ex) {
             s_logger.warn("Exception: ", ex);
             throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage());
-        }
+        } catch (ResourceAllocationException ex) {
+		    s_logger.warn("Exception: ", ex);
+		    throw new ServerApiException(BaseCmd.RESOURCE_ALLOCATION_ERROR, ex.getMessage());
+        }            
     }
 }
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index 85b873cdd2b..cef0373b581 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -91,7 +91,7 @@ public interface UserVmService {
      */
     Volume detachVolumeFromVM(DetachVolumeCmd cmmd);
     
-    UserVm startVirtualMachine(StartVMCmd cmd) throws StorageUnavailableException, ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+    UserVm startVirtualMachine(StartVMCmd cmd) throws StorageUnavailableException, ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException;
     UserVm stopVirtualMachine(StopVMCmd cmd) throws ServerApiException, ConcurrentOperationException;
     UserVm rebootVirtualMachine(RebootVMCmd cmd) throws InsufficientCapacityException, ResourceUnavailableException;
     UserVm updateVirtualMachine(UpdateVMCmd cmd);
@@ -127,7 +127,7 @@ public interface UserVmService {
      * @throws PermissionDeniedException if the caller doesn't have any access rights to the VM.
      * @throws InvalidParameterValueException if the parameters are incorrect. 
      */
-    UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException;
+    UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
     
     /**
      * Starts the virtual machine created from createVirtualMachine.