[Ovirt-devel] [PATCH server] Reindent task_vm.rb
Ian Main
imain at redhat.com
Thu Dec 18 22:50:50 UTC 2008
This just changes the remaining 2 space indentation in task_vm to
4 space indentation.. yeah I'm evil.
Signed-off-by: Ian Main <imain at redhat.com>
---
src/task-omatic/task_vm.rb | 148 ++++++++++++++++++++++----------------------
1 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 05ca3eb..0c79b27 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -25,120 +25,120 @@ gem 'cobbler'
require 'cobbler'
def find_host(host_id)
- host = Host.find(:first, :conditions => [ "id = ?", host_id])
+ host = Host.find(:first, :conditions => [ "id = ?", host_id])
- if host == nil
- # Hm, we didn't find the host_id. Seems odd. Return a failure
- raise "Could not find host_id " + host_id.to_s
- end
+ if host == nil
+ # Hm, we didn't find the host_id. Seems odd. Return a failure
+ raise "Could not find host_id " + host_id.to_s
+ end
- return host
+ return host
end
def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
macAddr, bridge, diskDevices)
- doc = Document.new
+ doc = Document.new
- doc.add_element("domain", {"type" => "kvm"})
+ doc.add_element("domain", {"type" => "kvm"})
- doc.root.add_element("name").add_text(name)
+ doc.root.add_element("name").add_text(name)
- doc.root.add_element("uuid").add_text(uuid)
+ doc.root.add_element("uuid").add_text(uuid)
- doc.root.add_element("memory").add_text(memAllocated.to_s)
+ doc.root.add_element("memory").add_text(memAllocated.to_s)
- doc.root.add_element("currentMemory").add_text(memUsed.to_s)
+ doc.root.add_element("currentMemory").add_text(memUsed.to_s)
- doc.root.add_element("vcpu").add_text(vcpus.to_s)
+ doc.root.add_element("vcpu").add_text(vcpus.to_s)
- doc.root.add_element("os")
- doc.root.elements["os"].add_element("type").add_text("hvm")
- doc.root.elements["os"].add_element("boot", {"dev" => bootDevice})
+ doc.root.add_element("os")
+ doc.root.elements["os"].add_element("type").add_text("hvm")
+ doc.root.elements["os"].add_element("boot", {"dev" => bootDevice})
- doc.root.add_element("clock", {"offset" => "utc"})
+ doc.root.add_element("clock", {"offset" => "utc"})
- doc.root.add_element("on_poweroff").add_text("destroy")
+ doc.root.add_element("on_poweroff").add_text("destroy")
- doc.root.add_element("on_reboot").add_text("restart")
+ doc.root.add_element("on_reboot").add_text("restart")
- doc.root.add_element("on_crash").add_text("destroy")
+ doc.root.add_element("on_crash").add_text("destroy")
- doc.root.add_element("devices")
- doc.root.elements["devices"].add_element("emulator").add_text("/usr/bin/qemu-kvm")
+ doc.root.add_element("devices")
+ doc.root.elements["devices"].add_element("emulator").add_text("/usr/bin/qemu-kvm")
- devs = ['hda', 'hdb', 'hdc', 'hdd']
- which_device = 0
- diskDevices.each do |disk|
- is_cdrom = (disk =~ /\.iso/) ? true : false
+ devs = ['hda', 'hdb', 'hdc', 'hdd']
+ which_device = 0
+ diskDevices.each do |disk|
+ is_cdrom = (disk =~ /\.iso/) ? true : false
- diskdev = Element.new("disk")
- diskdev.add_attribute("type", is_cdrom ? "file" : "block")
- diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
+ diskdev = Element.new("disk")
+ diskdev.add_attribute("type", is_cdrom ? "file" : "block")
+ diskdev.add_attribute("device", is_cdrom ? "cdrom" : "disk")
- if is_cdrom
- diskdev.add_element("readonly")
- diskdev.add_element("source", {"file" => disk})
- diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
- else
- diskdev.add_element("source", {"dev" => disk})
- diskdev.add_element("target", {"dev" => devs[which_device]})
- end
+ if is_cdrom
+ diskdev.add_element("readonly")
+ diskdev.add_element("source", {"file" => disk})
+ diskdev.add_element("target", {"dev" => devs[which_device], "bus" => "ide"})
+ else
+ diskdev.add_element("source", {"dev" => disk})
+ diskdev.add_element("target", {"dev" => devs[which_device]})
+ end
- doc.root.elements["devices"] << diskdev
- which_device += 1
- end
+ doc.root.elements["devices"] << diskdev
+ which_device += 1
+ end
- doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
- doc.root.elements["devices"].elements["interface"].add_element("mac", {"address" => macAddr})
- doc.root.elements["devices"].elements["interface"].add_element("source", {"bridge" => bridge})
- doc.root.elements["devices"].add_element("input", {"type" => "mouse", "bus" => "ps2"})
- doc.root.elements["devices"].add_element("graphics", {"type" => "vnc", "port" => "-1", "listen" => "0.0.0.0"})
+ doc.root.elements["devices"].add_element("interface", {"type" => "bridge"})
+ doc.root.elements["devices"].elements["interface"].add_element("mac", {"address" => macAddr})
+ doc.root.elements["devices"].elements["interface"].add_element("source", {"bridge" => bridge})
+ doc.root.elements["devices"].add_element("input", {"type" => "mouse", "bus" => "ps2"})
+ doc.root.elements["devices"].add_element("graphics", {"type" => "vnc", "port" => "-1", "listen" => "0.0.0.0"})
- serial = Element.new("serial")
- serial.add_attribute("type", "pty")
- serial.add_element("target", {"port" => "0"})
- doc.root.elements["devices"] << serial
+ serial = Element.new("serial")
+ serial.add_attribute("type", "pty")
+ serial.add_element("target", {"port" => "0"})
+ doc.root.elements["devices"] << serial
- return doc
+ return doc
end
def set_vm_state(vm, state)
- vm.state = state
- vm.save!
+ vm.state = state
+ vm.save!
end
def set_vm_vnc_port(vm, domain)
- doc = REXML::Document.new(domain.xml_desc)
- attrib = REXML::XPath.match(doc, "//graphics/@port")
- if not attrib.empty?:
- vm.vnc_port = attrib.to_s.to_i
- end
- vm.save!
+ doc = REXML::Document.new(domain.xml_desc)
+ attrib = REXML::XPath.match(doc, "//graphics/@port")
+ if not attrib.empty?:
+ vm.vnc_port = attrib.to_s.to_i
+ end
+ vm.save!
end
def find_vm(task, fail_on_nil_host_id = true)
- # find the matching VM in the vms table
- vm = task.vm
+ # find the matching VM in the vms table
+ vm = task.vm
- if vm == nil
- raise "VM #{task.vm} not found for task #{task.id}"
- end
+ if vm == nil
+ raise "VM #{task.vm} not found for task #{task.id}"
+ end
- if vm.host_id == nil && fail_on_nil_host_id
- raise "No host_id for VM " + vm.id.to_s
- end
+ if vm.host_id == nil && fail_on_nil_host_id
+ raise "No host_id for VM " + vm.id.to_s
+ end
- return vm
+ return vm
end
def set_vm_shut_down(vm)
- vm.host_id = nil
- vm.memory_used = nil
- vm.num_vcpus_used = nil
- vm.state = Vm::STATE_STOPPED
- vm.needs_restart = nil
- vm.vnc_port = nil
- vm.save!
+ vm.host_id = nil
+ vm.memory_used = nil
+ vm.num_vcpus_used = nil
+ vm.state = Vm::STATE_STOPPED
+ vm.needs_restart = nil
+ vm.vnc_port = nil
+ vm.save!
end
--
1.6.0.4
More information about the ovirt-devel
mailing list