Adding the ability to CANCEL a virtual machine

Added it in the Dispatch Manager (lcm already prepared),
the Request Manager and the ruby CLI

git-svn-id: http://svn.opennebula.org/trunk@88 3034c82b-c49b-4eb3-8279-a7acafdc01c0

include/DispatchManager.h

@@ -166,6 +166,15 @@ public:
     int stop(
         int vid);
 
+    /**
+     *  Cancels a VM.
+     *    @param vid VirtualMachine identification
+     *    @return 0 on success, -1 if the VM does not exits or -2 if the VM is 
+     *    in a wrong a state 
+     */       
+    int cancel(
+        int vid);
+
     /**
      *  Suspends a VM.
      *    @param vid VirtualMachine identification

include/RequestManager.h

@@ -245,6 +245,29 @@ private:
     
     /* ---------------------------------------------------------------------- */
     
+    class VirtualMachineCancel: public xmlrpc_c::method
+    {
+    public:
+        VirtualMachineCancel(
+            VirtualMachinePool * _vmpool):
+                vmpool(_vmpool)
+        {
+            _signature="A:si";
+            _help="Cancels a virtual machine";
+        };
+
+        ~VirtualMachineCancel(){};
+
+        void execute(
+            xmlrpc_c::paramList const& paramList,
+            xmlrpc_c::value *   const  retval);
+
+    private:
+        VirtualMachinePool * vmpool;
+    };    
+    
+    /* ---------------------------------------------------------------------- */
+    
     class VirtualMachineInfo: public xmlrpc_c::method
     {
     public:

src/client/ruby/one.rb

@@ -229,7 +229,8 @@ module ONE
                 "deploy"    => [:to_i, :to_i],
                 "action"    => [:to_s, :to_i],
                 "migrate_"  => [:to_i, :to_i, nil],
-                "get_info"  => [:to_i]
+                "get_info"  => [:to_i],
+                "cancel"    => [:to_i]
             }
         end
         
@@ -273,6 +274,10 @@ module ONE
             self.action("stop", args[0])
         end
         
+        def cancel(*args)
+            self.action("cancel", args[0])
+        end
+        
         def suspend(*args)
             self.action("suspend", args[0])
         end

src/client/ruby/onevm

@@ -316,6 +316,9 @@ Commands:
 
 * stop (Stops a running VM)
     onevm stop <vm_id>
+    
+* cancel (Cancels a running VM)
+    onevm cancel <vm_id>
 
 * suspend (Saves a running VM)
     onevm suspend <vm_id>
@@ -443,6 +446,14 @@ when "stop"
         puts "Stopping VM"
         exit 0
     end
+    
+when "cancel"
+    check_parameters("cancel", 1)
+    result=vm.cancel(*ARGV)
+    if result[0]
+        puts "Cancelling VM"
+        exit 0
+    end
 
 when "suspend"
     check_parameters("suspend", 1)

src/dm/DispatchManagerActions.cc

@@ -357,6 +357,51 @@ error:
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 
+int DispatchManager::cancel(
+    int vid)
+{
+    VirtualMachine *    vm;
+    ostringstream       oss;
+    
+    vm = vmpool->get(vid,true);
+    
+    if ( vm == 0 )
+    {
+        return -1;
+    }
+    
+    oss << "Cancelling VM " << vid; 
+    Nebula::log("DiM",Log::DEBUG,oss);
+    
+    if (vm->get_state()     == VirtualMachine::ACTIVE &&
+        vm->get_lcm_state() == VirtualMachine::RUNNING )
+    {
+        Nebula&             nd  = Nebula::instance();
+        LifeCycleManager *  lcm = nd.get_lcm();
+
+        vm->unlock();
+        
+        lcm->trigger(LifeCycleManager::CANCEL,vid);       
+    }
+    else
+    {
+        goto error; 
+    }
+    
+    return 0;
+    
+error:
+    oss.str("");
+    oss << "Could not cancel VM " << vid << ", wrong state.";
+    Nebula::log("DiM",Log::ERROR,oss);
+    
+    vm->unlock();
+    return -2;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 int DispatchManager::suspend(
     int vid)
 {

src/rm/RequestManager.cc

@@ -223,6 +223,9 @@ void RequestManager::register_xml_methods()
         
     xmlrpc_c::methodPtr vm_action(new 
         RequestManager::VirtualMachineAction);
+
+    xmlrpc_c::methodPtr vm_cancel(new 
+        RequestManager::VirtualMachineCancel(vmpool));
         
     xmlrpc_c::methodPtr vm_info(new 
         RequestManager::VirtualMachineInfo(vmpool));
@@ -245,6 +248,7 @@ void RequestManager::register_xml_methods()
     RequestManagerRegistry.addMethod("one.vmdeploy", vm_deploy);
     RequestManagerRegistry.addMethod("one.vmaction", vm_action);
     RequestManagerRegistry.addMethod("one.vmmigrate", vm_migrate);
+    RequestManagerRegistry.addMethod("one.vmcancel", vm_cancel);
     RequestManagerRegistry.addMethod("one.vmget_info", vm_info);
      
     /* Host related methods*/

src/rm/RequestManagerAction.cc

@@ -58,6 +58,10 @@ void RequestManager::VirtualMachineAction::execute(
     {
         rc = dm->stop(vid);
     }
+    else if (action == "cancel")
+    {
+        rc = dm->cancel(vid);
+    }
     else if (action == "suspend")
     {
         rc = dm->suspend(vid);

src/rm/RequestManagerInfo.cc

@@ -45,7 +45,7 @@ void RequestManager::VirtualMachineInfo::execute(
     session      = xmlrpc_c::value_string(paramList.getString(0));
     vid          = xmlrpc_c::value_int   (paramList.getInt(1));
 
-    // Perform the allocation in the hostpool 
+    // Perform the allocation in the vmpool 
     vm = VirtualMachineInfo::vmpool->get(vid,true);
        
                                                  

src/rm/SConstruct

@@ -10,7 +10,8 @@ source_files=[
     'RequestManagerAction.cc',
     'RequestManagerAllocate.cc',
     'RequestManagerDeploy.cc',
-	'RequestManagerMigrate.cc',    
+    'RequestManagerMigrate.cc',    
+    'RequestManagerCancel.cc',
     'RequestManagerInfo.cc',
     'RequestManagerHostAllocate.cc',
     'RequestManagerHostDelete.cc',