rbovirt 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/ovirt/disk.rb

@@ -0,0 +1,41 @@
+module OVIRT
+
+  class Disk < BaseObject
+    attr_reader :size, :disk_type, :bootable, :interface, :format, :sparse, :storage_domain, :vm
+
+    def initialize(client, xml)
+      super(client, xml[:id], xml[:href], (xml/'name').first.text)
+      parse_xml_attributes!(xml)
+      self
+    end
+
+    def self.to_xml(storage_domain_id,opts={})
+       builder = Nokogiri::XML::Builder.new do
+        disk_{
+          storage_domains_{
+            storage_domain_(:id => storage_domain_id)
+          }
+          size_(opts[:size] || 8589934592)
+          type_(opts[:type] || 'system')
+          bootable_(opts[:bootable] || 'true')
+          interface_(opts[:interface] || 'virtio')
+          format_(opts[:format] || 'cow')
+          sparse_(opts[:sparse] || 'true')
+        }
+      end
+      Nokogiri::XML(builder.to_xml).root.to_s
+    end
+
+    def parse_xml_attributes!(xml)
+     @storage_domain = (xml/'storage_domains/storage_domain').first[:id]
+     @size = (xml/'size').first.text
+     @disk_type = (xml/'type').first.text
+     @bootable = (xml/'bootable').first.text
+     @interface = (xml/'interface').first.text
+     @format = (xml/'format').first.text
+     @sparse = (xml/'sparse').first.text
+     @vm = Link::new(@client, (xml/'vm').first[:id], (xml/'vm').first[:href])
+    end
+
+  end
+end

data/lib/ovirt/nic.rb

@@ -0,0 +1,33 @@
+module OVIRT
+
+  class Nic < BaseObject
+    attr_reader :name, :mac, :interface, :network, :vm
+
+    def initialize(client, xml)
+      super(client, xml[:id], xml[:href], (xml/'name').first.text)
+      parse_xml_attributes!(xml)
+      self
+    end
+
+    def self.to_xml(opts={})
+      builder = Nokogiri::XML::Builder.new do
+        nic{
+          name_(opts[:name] || 'eth0')
+          network{
+            name_(opts[:network] || 'ovirtmgmt')
+          }
+        }
+      end
+      Nokogiri::XML(builder.to_xml).root.to_s
+    end
+
+    def parse_xml_attributes!(xml)
+     @name = (xml/'name').first.text
+     @mac = (xml/'mac').first[:address]
+     @interface = (xml/'interface').first.text
+     @network = (xml/'network').first[:id]
+     @vm = Link::new(@client, (xml/'vm').first[:id], (xml/'vm').first[:href])
+    end
+
+  end
+end

data/lib/ovirt/vm.rb

@@ -4,17 +4,20 @@ module OVIRT
     FILEINJECT_PATH = "user-data.txt"
 
   class VM < BaseObject
-    attr_reader :description, :status, :memory, :profile, :display, :host, :cluster, :template, :macs
-    attr_reader :storage, :cores, :username, :creation_time
-    attr_reader :ip, :vnc
+    attr_reader :description, :status, :memory, :profile, :display, :host, :cluster, :template, :nics
+    attr_reader :storage, :cores, :creation_time, :os, :ip, :vnc
+    attr_accessor :nics, :disks
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
-      @username = client.credentials[:username]
       parse_xml_attributes!(xml)
       self
     end
 
+    def running?
+      @status =~ /up/i
+    end
+
     def self.to_xml(template_name, cluster_name, opts={})
       builder = Nokogiri::XML::Builder.new do
         vm{
@@ -50,39 +53,11 @@ module OVIRT
       Nokogiri::XML(builder.to_xml).root.to_s
     end
 
-    def self.disk_xml(storage_domain_id,opts={})
-       builder = Nokogiri::XML::Builder.new do
-        disk_{
-          storage_domains_{
-            storage_domain_(:id => storage_domain_id)
-          }
-          size_(opts[:size] || 8589934592)
-          type_(opts[:type] || 'system')
-          bootable_(opts[:bootable] || 'true')
-          interface_(opts[:interface] || 'virtio')
-          format_(opts[:format] || 'cow')
-          sparse_(opts[:sparse] || 'true')
-        }
-      end
-      Nokogiri::XML(builder.to_xml).root.to_s
-    end
-
-    def self.nic_xml(opts={})
-      builder = Nokogiri::XML::Builder.new do
-        nic{
-          name_(opts[:name] || 'eth0')
-          network{
-            name_(opts[:network] || 'ovirtmgmt')
-          }
-        }
-      end
-      Nokogiri::XML(builder.to_xml).root.to_s
-    end
     private
 
     def parse_xml_attributes!(xml)
       @description = ((xml/'description').first.text rescue '')
-      @status = (xml/'status').first.text
+      @status = ((xml/'status').first.text rescue 'unknown')
       @memory = (xml/'memory').first.text
       @profile = (xml/'type').first.text
       @template = Link::new(@client, (xml/'template').first[:id], (xml/'template').first[:href])
@@ -96,13 +71,16 @@ module OVIRT
       }
       @cores = ((xml/'cpu/topology').first[:cores] rescue nil)
       @storage = ((xml/'disks/disk/size').first.text rescue nil)
-      @macs = (xml/'nics/nic/mac').collect { |mac| mac[:address] }
       @creation_time = (xml/'creation_time').text
       @ip = ((xml/'guest_info/ip').first[:address] rescue nil)
       @vnc = {
         :address => ((xml/'display/address').first.text rescue "127.0.0.1"),
         :port => ((xml/'display/port').first.text rescue "5890")
       } unless @ip
+      @os = {
+          :type => (xml/'os').first[:type],
+          :boot => (xml/'os/boot').collect {|boot| boot[:dev] }
+      }
     end
 
   end

data/lib/rbovirt.rb

@@ -5,6 +5,8 @@ require "ovirt/host"
 require "ovirt/storage_domain"
 require "ovirt/template"
 require "ovirt/vm"
+require "ovirt/disk"
+require "ovirt/nic"
 
 require "nokogiri"
 require "rest_client"
@@ -33,16 +35,22 @@ module OVIRT
       @api_entrypoint = api_entrypoint
     end
 
-    def vm(vm_id)
+    def vm(vm_id, opts={})
       headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
-      vm = http_get("/vms/%s" % vm_id, headers).root
-      OVIRT::VM::new(self, vm)
+      vm = OVIRT::VM::new(self,  http_get("/vms/%s" % vm_id, headers).root)
+      vm.nics = http_get("/vms/%s/nics" % vm_id, headers).xpath('/nics/nic').collect do |nic|
+        OVIRT::Nic::new(self, nic)
+      end if opts[:nics]
+      vm.disks = http_get("/vms/%s/disks" % vm_id, headers).xpath('/disks/disk').collect do |disk|
+        OVIRT::Disk::new(self, disk)
+      end if opts[:disks]
+      vm
     end
 
     def vms(opts={})
       headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
-      search= opts[:search] || ("datacenter=$s" % current_datacenter.name)
-      http_get("/vms?search=%s" % search, headers).xpath('/vms/vm').collect do |vm|
+      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
+      http_get("/vms?search=%s" % CGI.escape(search), headers).xpath('/vms/vm').collect do |vm|
         OVIRT::VM::new(self, vm)
       end
     end
@@ -78,12 +86,12 @@ module OVIRT
 
     def add_disk(vm_id, opts={})
       storage_domain_id = opts[:storage_domain] || storagedomains.first.id
-      result_xml = http_post("/vms/%s/disks" % vm_id, VM.disk_xml(storage_domain_id, opts))
+      result_xml = http_post("/vms/%s/disks" % vm_id, OVIRT::Disk.to_xml(storage_domain_id, opts))
     end
 
 
     def add_nic(vm_id, opts={})
-      http_post("/vms/%s/nics" % vm_id, VM.nic_xml( opts))
+      http_post("/vms/%s/nics" % vm_id, OVIRT::Nic.to_xml( opts))
     end
 
     def create_template(vm_id, opts)

data/rbovirt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbovirt}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Benari"]
-  s.date = %q{2012-01-16}
+  s.date = %q{2012-01-18}
   s.description = %q{A Ruby client for oVirt REST API}
   s.email = %q{abenari@redhat.com}
   s.extra_rdoc_files = [
@@ -26,7 +26,9 @@ Gem::Specification.new do |s|
     "lib/ovirt/base_object.rb",
     "lib/ovirt/cluster.rb",
     "lib/ovirt/datacenter.rb",
+    "lib/ovirt/disk.rb",
     "lib/ovirt/host.rb",
+    "lib/ovirt/nic.rb",
     "lib/ovirt/storage_domain.rb",
     "lib/ovirt/template.rb",
     "lib/ovirt/vm.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbovirt
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Amos Benari
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 +02:00
+date: 2012-01-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,7 +125,9 @@ files:
 - lib/ovirt/base_object.rb
 - lib/ovirt/cluster.rb
 - lib/ovirt/datacenter.rb
+- lib/ovirt/disk.rb
 - lib/ovirt/host.rb
+- lib/ovirt/nic.rb
 - lib/ovirt/storage_domain.rb
 - lib/ovirt/template.rb
 - lib/ovirt/vm.rb