shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-08-25 21:49:29 +03:00
Code Releases Wiki Activity

Minor changes in LibVirt driver

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@373 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Rubén S. Montero
2009-02-21 19:35:32 +00:00
parent e91583d8ae
commit 97926ca5de
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vmm_mad/kvm/one_vmm_kvm.rb
View File

@ -37,7 +37,7 @@ require "VirtualMachineDriver"
require "CommandManager"
# ---------------------------------------------------------------------------- #
# The main class for the EC2 driver #
# The main class for the LibVirt driver #
# ---------------------------------------------------------------------------- #
class LibVirtDriver < VirtualMachineDriver
@ -46,6 +46,7 @@ class LibVirtDriver < VirtualMachineDriver
# Libvirt commands constants #
# ------------------------------------------------------------------------ #
QEMU_PROTOCOL = "qemu+ssh"
LIBVIRT = {
:create => "virsh create",
:shutdown => "virsh shutdown",
@ -77,8 +78,7 @@ class LibVirtDriver < VirtualMachineDriver
end
tmp = File.new(local_dfile)
domain = String.new
tmp.each { |line| domain << line }
domain = tmp.read
tmp.close()
deploy_cmd = "cat > #{remote_dfile} && " \
@ -92,7 +92,7 @@ class LibVirtDriver < VirtualMachineDriver
send_message(ACTION[:deploy],RESULT[:success],id,$1)
else
send_message(ACTION[:deploy],RESULT[:failure],id,
"Domain id not found.")
"Domain id not found in #{LIBVIRT[:create]} output.")
end
end
@ -177,12 +177,12 @@ private
command_exe = SSHCommand.run(command, host, log_method(id))
if command_exe.code == 0
result = RESULT[:success]
result = :success
else
result = RESULT[:failure]
result = :failure
end
send_message(ACTION[action],result,id)
send_message(ACTION[action],RESULT[result],id)
end
end