From 9d995f881a024065a6cd39958d0e9d2f93035359 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 22 Jul 2013 23:32:32 +0200
Subject: [PATCH] bug #2200: Number of VMS can be set in quota del operation.
 Prevents updating VMS_USED if set to 0 in update

(cherry picked from commit df4d7db2adc989a72985a83b98f737b055c7cac7)
---
 src/rm/RequestManagerVirtualMachine.cc | 1 +
 src/um/QuotaVirtualMachine.cc          | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index 427b2b3ac7..d28f83f026 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -1295,6 +1295,7 @@ void VirtualMachineResize::request_execute(xmlrpc_c::paramList const& paramList,
 
     deltas.add("MEMORY", dmemory);
     deltas.add("CPU", dcpu);
+    deltas.add("VMS", 0);
 
     switch (vm->get_state())
     {
diff --git a/src/um/QuotaVirtualMachine.cc b/src/um/QuotaVirtualMachine.cc
index 1df620dba7..a7cf49c240 100644
--- a/src/um/QuotaVirtualMachine.cc
+++ b/src/um/QuotaVirtualMachine.cc
@@ -84,7 +84,7 @@ void QuotaVirtualMachine::del(Template * tmpl)
 {
     map<string, float> vm_request;
 
-    int memory;
+    int memory, vms;
     float cpu;
 
     if ( tmpl->get("MEMORY", memory) == false )
@@ -97,7 +97,12 @@ void QuotaVirtualMachine::del(Template * tmpl)
         cpu = 0;
     }
 
-    vm_request.insert(make_pair("VMS",1));
+    if ( tmpl->get("VMS", vms) == false )
+    {
+        vms = 1;
+    }
+
+    vm_request.insert(make_pair("VMS", vms));
     vm_request.insert(make_pair("MEMORY", memory));
     vm_request.insert(make_pair("CPU", cpu));