virt 0.1.0 → 0.2.0

data/README.rdoc

@@ -50,7 +50,8 @@ for full API please visit http://rdoc.info/github/ohadlevy/virt
 
   puts guest.mac
 
-  guest.stop
+  guest.shutdown     # initiate a shutdown
+  guest.poweroff     # forces a shutdown
 Many more options exists, make sure checkout the api/tests
 
 ==== list of host bridges

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/virt/guest.rb

@@ -1,21 +1,22 @@
 module Virt
   class Guest
     include Virt::Util
-    attr_reader :name, :xml_desc
-    attr_accessor :memory, :vcpu, :arch, :volume, :interface, :template_path
+    attr_reader :name, :xml_desc, :arch, :current_memory, :type, :boot_device, :machine
+    attr_accessor :memory, :vcpu, :volume, :interface, :template_path
 
     def initialize options = {}
-    @connection = Virt.connection
-    @name       = options[:name]   || raise("Must provide a name")
-    # If our domain exists, we ignore the provided options and defaults
-    fetch_guest
-    @memory ||= options[:memory] || default_memory_size
-    @vcpu   ||= options[:vcpu]   || default_vcpu_count
-    @arch   ||= options[:arch]   || default_arch
-
-    @template_path = options[:template_path] || default_template_path
-    @volume        = Volume.new options
-    @interface     = Interface.new options.merge({:mac => @mac})
+      @connection = Virt.connection
+      @name = options[:name] || raise("Must provide a name")
+
+      # If our domain exists, we ignore the provided options and defaults
+      fetch_guest
+      @memory ||= options[:memory] || default_memory_size
+      @vcpu   ||= options[:vcpu]   || default_vcpu_count
+      @arch   ||= options[:arch]   || default_arch
+
+      @template_path = options[:template_path] || default_template_path
+      @volume        = Volume.new options
+      @interface   ||= Interface.new options
     end
 
     def new?
@@ -37,7 +38,7 @@ module Virt
     def running?
       return false if new?
       @domain.active?
-    rescue 
+    rescue
       # some versions of libvirt do not support checking for active state
       @connection.connection.list_domains.each do |did|
         return true if @connection.connection.lookup_domain_by_id(did).name == name
@@ -45,26 +46,51 @@ module Virt
       false
     end
 
-    def stop
+    def stop(force=false)
       raise "Guest not created, can't stop" if new?
-      @domain.destroy
+      force ? @domain.destroy : @domain.shutdown
       !running?
     rescue Libvirt::Error
       # domain is not running
       true
     end
 
+    def shutdown
+      stop
+    end
+
+    def poweroff
+      stop(true)
+    end
+
     def destroy
       return true if new?
-      stop if running?
+      stop(true) if running?
       @domain = @domain.undefine
       new?
     end
 
+    def reboot
+      raise "Guest not running, can't reboot" if new? or !running?
+      @domain.reboot
+    end
+
     def uuid
       @domain.uuid unless new?
     end
 
+    def arch= value
+      @arch = value == "i386" ? "i686" : value
+    end
+
+    def to_s
+      name.to_s
+    end
+
+    def <=> other
+      self.name <=> other.name
+    end
+
     private
 
     def fetch_guest
@@ -75,12 +101,25 @@ module Virt
 
     def fetch_info
       return if @domain.nil?
-      @xml_desc = @domain.xml_desc
-      @memory   = @domain.max_memory
-      @vcpu     = document("domain/vcpu")
-      @arch     = document("domain/os/type", "arch")
-      @mac      = document("domain/devices/interface/mac", "address")
-      @interface.mac = @mac if @interface
+      @xml_desc       = @domain.xml_desc
+      @memory         = @domain.max_memory
+      @current_memory = document("domain/currentMemory") if running?
+      @type           = document("domain", "type")
+      @vcpu           = document("domain/vcpu")
+      @arch           = document("domain/os/type", "arch")
+      @machine        = document("domain/os/type", "machine")
+      @boot_device    = document("domain/os/boot", "dev")
+
+      # do we have a NIC?
+      network_type = document("domain/devices/interface", "type") rescue nil
+
+      unless network_type.nil?
+        @interface       ||= Interface.new
+        @interface.type    = network_type
+        @interface.mac     = document("domain/devices/interface/mac", "address")
+        @interface.device  = document("domain/devices/interface/source", "bridge")  if @interface.type == "bridge"
+        @interface.network = document("domain/devices/interface/source", "network") if @interface.type == "network"
+     end
     end
 
     def default_memory_size

data/lib/virt/interface.rb

@@ -1,6 +1,6 @@
 module Virt
   class Interface
-    attr_accessor  :mac, :model, :type, :device
+    attr_accessor  :mac, :model, :type, :device, :network
 
     def initialize options = {}
       @connection = Virt.connection
@@ -8,6 +8,7 @@ module Virt
       @type       = options[:type]   || default_type
       @model      = options[:model]  || default_model
       @mac        = options[:mac]
+      @network    = options[:network]
     end
 
     def new?

data/lib/virt/volume.rb

@@ -1,7 +1,7 @@
 module Virt
   class Volume
     include Virt::Util
-    attr_reader :name, :pool, :path, :type, :allocated_size, :size, :template_path, :key
+    attr_reader :name, :pool, :type, :allocated_size, :size, :template_path, :key
 
     def initialize options = {}
       @connection     = Virt.connection
@@ -10,7 +10,7 @@ module Virt
       @allocated_size = options[:allocated_size] || default_allocated_size
       @template_path  = options[:template_path]  || default_template_path
       @size           = options[:size]           || default_size
-      @pool           = @connection.host.storage_pool(options[:pool] || "default")
+      @pool           = options[:pool].nil? ? @connection.host.storage_pools.first : @connection.host.storage_pool(options[:pool])
       fetch_volume
     end
 

data/templates/guest.xml.erb

@@ -46,7 +46,7 @@
       <target port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
     <video>
       <model type='cirrus' vram='9216' heads='1'/>
     </video>

data/test/guest_test.rb

@@ -9,6 +9,11 @@ class Virt::GuestTest < Test::Unit::TestCase
     @guest = Virt::Guest.new({:name => "test-host-#{Time.now.to_i}"})
   end
 
+  def teardown
+    @guest.destroy
+    Virt.connection.disconnect unless Virt.connection.closed?
+  end
+
   def test_should_be_new
     assert @guest.new?
     assert @guest.interface.new?
@@ -19,7 +24,14 @@ class Virt::GuestTest < Test::Unit::TestCase
     assert @guest.save
     assert !@guest.interface.new?
     assert_not_nil @guest.interface.mac
-    @guest.destroy
+  end
+
+  def test_should_be_able_to_save_32bit_guest
+    @guest.arch = "i386"
+    assert_equal @guest.arch, "i686"
+    assert @guest.save
+    assert !@guest.interface.new?
+    assert_not_nil @guest.interface.mac
   end
 
   def test_should_be_able_to_destroy

data/virt.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{virt}
-  s.version = "0.1.0"
+  s.name = "virt"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ohad Levy"]
-  s.date = %q{2011-01-31}
-  s.description = %q{Simplied interface to use ruby the libvirt ruby library}
-  s.email = %q{ohadlevy@gmail.com}
+  s.date = "2011-11-15"
+  s.description = "Simplied interface to use ruby the libvirt ruby library"
+  s.email = "ohadlevy@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -43,11 +43,11 @@ Gem::Specification.new do |s|
     "test/volume_test.rb",
     "virt.gemspec"
   ]
-  s.homepage = %q{https://github.com/ohadlevy/virt}
+  s.homepage = "https://github.com/ohadlevy/virt"
   s.licenses = ["GPLv3"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple to use ruby interface to libvirt}
+  s.rubygems_version = "1.7.2"
+  s.summary = "Simple to use ruby interface to libvirt"
   s.test_files = [
     "test/connection_test.rb",
     "test/guest_test.rb",
@@ -59,7 +59,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: virt
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ohad Levy
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +02:00
-default_executable: 
+date: 2011-11-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: shoulda
+  type: :development
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +31,11 @@ dependencies:
         - 11
         - 3
         version: 2.11.3
+  prerelease: false
   requirement: *id001
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: bundler
+  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +47,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
   requirement: *id002
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: jeweler
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +63,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
+  prerelease: false
   requirement: *id003
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rcov
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,8 +79,8 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
+  prerelease: false
   requirement: *id004
-  type: :development
 description: Simplied interface to use ruby the libvirt ruby library
 email: ohadlevy@gmail.com
 executables: []
@@ -117,7 +116,6 @@ files:
 - test/test_helper.rb
 - test/volume_test.rb
 - virt.gemspec
-has_rdoc: true
 homepage: https://github.com/ohadlevy/virt
 licenses: 
 - GPLv3
@@ -147,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Simple to use ruby interface to libvirt