rbovirt 0.0.21 → 0.0.22

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 66f25b02a4d111b071e462bea72d9e77520b6dd1
+  data.tar.gz: 54b4faa6d9047cd217cce97992b72697a6cfe542
+SHA512:
+  metadata.gz: 297ff6778ae94e0d29d8dbb42d9cc3927278ccd7c1bfdf34e5458026e58ae744ade61b49b0e21d6461635d7f28b997ef51746677cc9f958faf96aa02646b9e07
+  data.tar.gz: 788f983b0f7d1db2baf583a2cb35f965cc4da9e482a975b39e8dbef1ba42b87ce9e7a24b78ddef25523d00a0a8b8576d68e751252318695d591f84b1e5068674

data/.gitignore

@@ -0,0 +1,54 @@
+Gemfile.lock
+endpoint.yml
+
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# idea
+.idea
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/Gemfile

@@ -4,13 +4,15 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem "nokogiri"
 gem "rest-client"
+gem "rdoc"
+gem "rspec"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "rcov", "<= 0.9.11"
   gem "rspec-rails", "~> 2.6"
 end

data/Rakefile

@@ -1,60 +1,9 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "rbovirt"
-  gem.homepage = "http://github.com/abenari/rbovirt"
-  gem.license = "MIT"
-  gem.summary = %Q{A Ruby client for oVirt REST API}
-  gem.description = %Q{A Ruby client for oVirt REST API}
-  gem.email = "abenari@redhat.com"
-  gem.authors = ["Amos Benari"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
+require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |test|
-  #test.libs << 'lib' << 'spec'
-  test.pattern = 'spec/**/*_spec.rb'
-  test.verbose = true
-end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.pattern = "./spec/**/*_spec.rb"
+  task.rspec_opts = ['--color']
 end
 
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rbovirt #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec

data/lib/client/quota_api.rb

@@ -1,7 +1,7 @@
 module OVIRT
   class Client
     def quota(quota_id, opts={})
-      q = http_get("/datacenters/%s/quotas/%s" % current_datacenter.id % quota_id)
+      q = http_get("/datacenters/%s/quotas/%s" % [current_datacenter.id, quota_id])
       OVIRT::Quota::new(self, q.root)
     end
 

data/lib/ovirt/datacenter.rb

@@ -14,7 +14,7 @@ module OVIRT
     def parse_xml_attributes!(xml)
       @description = (xml/'description').first.text rescue nil
       @status = (xml/'status').first.text.strip
-      @storage_type = (xml/'storage_type').first.text
+      @storage_type = (xml/'storage_type').first.text rescue nil
       @storage_format = (xml/'storage_format').first.text rescue nil
       @supported_versions = (xml/'supported_versions').collect { |v|
         parse_version v
@@ -23,4 +23,4 @@ module OVIRT
     end
   end
  
-end
+end

data/lib/ovirt/version.rb

@@ -0,0 +1,3 @@
+module OVIRT
+  VERSION = "0.0.22"
+end

data/lib/ovirt/vm.rb

@@ -74,17 +74,18 @@ module OVIRT
                topology( :cores => (opts[:cores] || '1'), :sockets => '1' )
              }
           end
-          if(opts[:first_boot_dev] && opts[:first_boot_dev] == 'network')
-            os{
+          os({:type => opts[:os_type] || 'unassigned' }){
+            if(opts[:first_boot_dev] && opts[:first_boot_dev] == 'network')
               boot(:dev=> opts[:boot_dev1] || 'network')
               boot(:dev=> opts[:boot_dev2] || 'hd')
-            }
-          else
-            os{
+            else
               boot(:dev=> opts[:boot_dev2] || 'hd')
               boot(:dev=> opts[:boot_dev1] || 'network')
-            }
-          end
+            end
+            kernel (opts[:os_kernel])
+            initrd (opts[:os_initrd])
+            cmdline (opts[:os_cmdline])
+          }
           display_{
             type_(opts[:display][:type])
           } if opts[:display]
@@ -135,6 +136,12 @@ module OVIRT
           :boot => (xml/'os/boot').collect {|boot| boot[:dev] }
       }
       @quota = ((xml/'quota').first[:id] rescue nil)
+
+      disks = xml/'disks/disk'
+      @volumes = disks.length > 0 ? disks.collect {|disk| OVIRT::Volume::new(@client, disk)} : nil
+
+      interfaces = xml/'nics/nic'
+      @interfaces = interfaces.length > 0 ? interfaces.collect {|nic| OVIRT::Interface::new(@client, nic)} : nil
     end
 
   end

data/lib/ovirt/volume.rb

@@ -21,7 +21,9 @@ module OVIRT
           interface_(opts[:interface] || 'virtio')
           format_(opts[:format] || 'cow')
           sparse_(opts[:sparse] || 'true')
-	  quota_( :id => opts[:quota])
+          if opts[:quota]
+            quota_( :id => opts[:quota])
+          end
         }
       end
       Nokogiri::XML(builder.to_xml).root.to_s

data/lib/rbovirt.rb

@@ -9,6 +9,7 @@ require "ovirt/volume"
 require "ovirt/interface"
 require "ovirt/network"
 require "ovirt/quota"
+require "ovirt/version"
 
 require "client/vm_api"
 require "client/template_api"
@@ -133,10 +134,10 @@ module OVIRT
     end
 
     def http_headers(headers ={})
-      headers.merge({
+      filter_header.merge(auth_header).merge({
         :content_type => 'application/xml',
         :accept => 'application/xml',
-      }).merge(auth_header).merge(filter_header)
+      }).merge(headers)
     end
 
     def handle_fault(f)

data/rbovirt.gemspec

@@ -1,89 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ovirt/version'
 
-Gem::Specification.new do |s|
-  s.name = "rbovirt"
-  s.version = "0.0.21"
+Gem::Specification.new do |gem|
+  gem.name          = "rbovirt"
+  gem.version       = OVIRT::VERSION
+  gem.authors       = ['Amos Benari']
+  gem.email         = ['abenari@redhat.com']
+  gem.homepage      = "http://github.com/abenari/rbovirt"
+  gem.summary       = %q{A Ruby client for oVirt REST API}
+  gem.description   = <<-EOS
+    A Ruby client for oVirt REST API
+  EOS
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Amos Benari"]
-  s.date = "2013-07-22"
-  s.description = "A Ruby client for oVirt REST API"
-  s.email = "abenari@redhat.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/client/cluster_api.rb",
-    "lib/client/datacenter_api.rb",
-    "lib/client/host_api.rb",
-    "lib/client/quota_api.rb",
-    "lib/client/storage_domain_api.rb",
-    "lib/client/template_api.rb",
-    "lib/client/vm_api.rb",
-    "lib/ovirt/base_object.rb",
-    "lib/ovirt/cluster.rb",
-    "lib/ovirt/datacenter.rb",
-    "lib/ovirt/host.rb",
-    "lib/ovirt/interface.rb",
-    "lib/ovirt/network.rb",
-    "lib/ovirt/quota.rb",
-    "lib/ovirt/storage_domain.rb",
-    "lib/ovirt/template.rb",
-    "lib/ovirt/vm.rb",
-    "lib/ovirt/volume.rb",
-    "lib/rbovirt.rb",
-    "rbovirt.gemspec",
-    "spec/endpoint.yml.example",
-    "spec/integration/api_spec.rb",
-    "spec/integration/vm_crud_spec.rb",
-    "spec/lib/endpoint.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/vm_spec.rb"
-  ]
-  s.homepage = "http://github.com/abenari/rbovirt"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "A Ruby client for oVirt REST API"
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.6"])
-    else
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.6"])
-    end
-  else
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.6"])
-  end
-end
+  gem.add_runtime_dependency('nokogiri')
+  gem.add_runtime_dependency('rest-client')
+  gem.add_development_dependency('shoulda')
+  gem.add_development_dependency('rspec-rails', '~> 2.6')
+  gem.add_development_dependency('rake')
 
+  gem.rdoc_options << '--title' << gem.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
+  gem.extra_rdoc_files = ['README.rdoc']
+end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 #require 'bundler/setup'
 
 require 'rspec'
+require 'rspec/mocks'
 require 'rbovirt'
 
 module OVIRT::RSpec end
@@ -10,4 +11,4 @@ require "#{File.dirname(__FILE__)}/lib/endpoint"
 
 RSpec.configure do |config|
   config.include OVIRT::RSpec::Endpoint
-end
+end

data/spec/unit/client_spec.rb

@@ -0,0 +1,21 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+describe OVIRT::Client do
+
+  context 'http comms' do
+    before(:each) do
+      @sut = OVIRT::Client::new('mockuser','mockpass','http://example.com/api')
+    end
+      
+    it "should add Accept: headers" do
+      headers = @sut.send(:http_headers)
+      headers[:accept].should eql('application/xml')
+    end
+
+    it "should keep existing Accept: headers" do
+      value = "application/xml; detail=disks; detail=nics; detail=hosts"
+      headers = @sut.send(:http_headers, {:accept => value})
+      headers[:accept].should eql(value)
+    end
+  end
+end

data/spec/unit/vm_spec.rb

@@ -27,6 +27,48 @@ describe OVIRT::VM do
 <link rel="tags" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/tags"/>
 <link rel="permissions" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/permissions"/>
 <link rel="statistics" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/statistics"/>
+<nics>
+<nic href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012" id="12345678-1234-1234-1234-123456789012">
+<actions>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/deactivate" id="deactivate"/>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/activate" id="activate"/>
+</actions>
+<name>nic1</name>
+<vm href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549" id="76d29095-bc27-4cd0-8178-07e942aea549"/>
+<network href="/api/networks/00000000-0000-0000-0000-000000000000" id="00000000-0000-0000-0000-000000000000"/>
+<linked>true</linked>
+<interface>virtio</interface>
+<mac address="00:11:22:33:44:55"/>
+<active>true</active>
+<plugged>true</plugged>
+</nic>
+</nics>
+<disks>
+<disk href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012" id="12345678-1234-1234-1234-123456789012">
+<actions>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/deactivate" id="deactivate"/>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/move" id="move"/>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/activate" id="activate"/>
+</actions>
+<name>diskName</name>
+<image_id>00000000-0000-0000-0000-000000000000</image_id>
+<storage_domains>
+<storage_domain id="11111111-1111-1111-1111-111111111111"/>
+</storage_domains>
+<size>53687091200</size>
+<provisioned_size>53687091200</provisioned_size>
+<actual_size>143360</actual_size>
+<status><state>ok</state></status>
+<interface>virtio</interface>
+<format>cow</format>
+<sparse>true</sparse>
+<bootable>true</bootable>
+<shareable>false</shareable>
+<wipe_after_delete>false</wipe_after_delete>
+<propagate_errors>false</propagate_errors>
+<active>true</active>
+</disk>
+</disks>
 <type>server</type>
 <status>
 <state>up</state>
@@ -64,6 +106,119 @@ describe OVIRT::VM do
 </usb>
 </vm>
 END_HEREDOC
+
+      @min_xml = <<END_HEREDOC
+<vm id="76d29095-bc27-4cd0-8178-07e942aea549" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549">
+<name>c-1326980484</name>
+<actions>
+<link rel="shutdown" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/shutdown"/>
+<link rel="start" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/start"/>
+<link rel="stop" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/stop"/>
+<link rel="suspend" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/suspend"/>
+<link rel="detach" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/detach"/>
+<link rel="export" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/export"/>
+<link rel="move" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/move"/>
+<link rel="ticket" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/ticket"/>
+<link rel="migrate" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/migrate"/>
+<link rel="cancelmigration" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/cancelmigration"/>
+</actions>
+<link rel="disks" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/disks"/>
+<link rel="nics" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics"/>
+<link rel="cdroms" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/cdroms"/>
+<link rel="snapshots" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/snapshots"/>
+<link rel="tags" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/tags"/>
+<link rel="permissions" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/permissions"/>
+<link rel="statistics" href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/statistics"/>
+<type>server</type>
+<status>
+<state>up</state>
+</status>
+<memory>536870912</memory>
+<cpu>
+<topology cores="1" sockets="1"/>
+</cpu>
+<os type="unassigned">
+<boot dev="network"/>
+<boot dev="hd"/>
+</os>
+<high_availability>
+<enabled>false</enabled>
+<priority>0</priority>
+</high_availability>
+<display>
+<type>vnc</type>
+<monitors>1</monitors>
+</display>
+<cluster id="b68980dc-3ab8-11e1-bcbf-5254005f0f6f" href="/api/clusters/b68980dc-3ab8-11e1-bcbf-5254005f0f6f"/>
+<template id="00000000-0000-0000-0000-000000000000" href="/api/templates/00000000-0000-0000-0000-000000000000"/>
+<start_time>2012-01-19T14:41:58.428Z</start_time>
+<creation_time>2012-01-19T13:41:24.405Z</creation_time>
+<origin>rhev</origin>
+<stateless>false</stateless>
+<placement_policy>
+<affinity>migratable</affinity>
+</placement_policy>
+<memory_policy>
+<guaranteed>536870912</guaranteed>
+</memory_policy>
+<usb>
+<enabled>true</enabled>
+</usb>
+</vm>
+END_HEREDOC
+
+    end
+
+    before(:each) do
+      @mock_client = double("mock_client")
+      allow(@mock_client).to receive(:vm_interfaces) do
+        xml = <<END_HEREDOC
+<nic href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012" id="12345678-1234-1234-1234-123456789012">
+<actions>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/deactivate" id="deactivate"/>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/activate" id="activate"/>
+</actions>
+<name>nic2</name>
+<vm href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549" id="76d29095-bc27-4cd0-8178-07e942aea549"/>
+<network href="/api/networks/00000000-0000-0000-0000-000000000000" id="00000000-0000-0000-0000-000000000000"/>
+<linked>true</linked>
+<interface>virtio</interface>
+<mac address="00:11:22:33:44:55"/>
+<active>true</active>
+<plugged>true</plugged>
+</nic>
+END_HEREDOC
+        [OVIRT::Interface::new(nil, Nokogiri::XML(xml).xpath('/').first)]
+      end
+      allow(@mock_client).to receive(:vm_volumes) do
+        xml = <<END_HEREDOC
+<disk href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012" id="12345678-1234-1234-1234-123456789012">
+<actions>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/deactivate" id="deactivate"/>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/move" id="move"/>
+<link href="/api/vms/76d29095-bc27-4cd0-8178-07e942aea549/nics/12345678-1234-1234-1234-123456789012/activate" id="activate"/>
+</actions>
+<name>diskName2</name>
+<image_id>00000000-0000-0000-0000-000000000000</image_id>
+<storage_domains>
+<storage_domain id="11111111-1111-1111-1111-111111111111"/>
+</storage_domains>
+<size>53687091200</size>
+<provisioned_size>53687091200</provisioned_size>
+<actual_size>143360</actual_size>
+<status><state>ok</state></status>
+<interface>virtio</interface>
+<format>cow</format>
+<sparse>true</sparse>
+<bootable>true</bootable>
+<shareable>false</shareable>
+<wipe_after_delete>false</wipe_after_delete>
+<propagate_errors>false</propagate_errors>
+<active>true</active>
+</disk>
+END_HEREDOC
+        [OVIRT::Volume::new(nil, Nokogiri::XML(xml).xpath('/').first)]
+      end
     end
 
     it "should parse VM xml" do
@@ -82,7 +237,34 @@ END_HEREDOC
       vm.running?.should eql(true)
     end
 
+    it "should have one interface" do
+      vm = OVIRT::VM.new(nil, Nokogiri::XML(@xml).xpath('/').first)
+      vm.interfaces.length.should eql(1)
+
+      interface = vm.interfaces[0]
+      interface.name.should eql('nic1')
+      interface.mac.should eql('00:11:22:33:44:55')
+      interface.interface.should eql('virtio')
+    end
+
+    it "should have one volume" do
+      vm = OVIRT::VM.new(nil, Nokogiri::XML(@xml).xpath('/').first)
+      vm.volumes.length.should eql(1)
+
+      disk = vm.volumes[0]
+      disk.storage_domain.should eql('11111111-1111-1111-1111-111111111111')
+      disk.size.should eql('53687091200')
+      disk.interface.should eql('virtio')
+    end
 
+    it "should still fallback to the client" do
+      vm = OVIRT::VM.new(@mock_client, Nokogiri::XML(@min_xml).xpath('/').first)
+      vm.volumes.length.should eql(1)
+      vm.volumes[0].name.should eql('diskName2')
+
+      vm.interfaces.length.should eql(1)
+      vm.interfaces[0].name.should eql('nic2')
+    end
   end
 
 end

metadata

@@ -1,136 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbovirt
-version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 21
-  version: 0.0.21
+version: !ruby/object:Gem::Version
+  version: 0.0.22
 platform: ruby
-authors: 
+authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2014-02-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec-rails
-  type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  requirement: *id007
-description: A Ruby client for oVirt REST API
-email: abenari@redhat.com
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      A Ruby client for oVirt REST API
+email:
+- abenari@redhat.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -152,6 +112,7 @@ files:
 - lib/ovirt/quota.rb
 - lib/ovirt/storage_domain.rb
 - lib/ovirt/template.rb
+- lib/ovirt/version.rb
 - lib/ovirt/vm.rb
 - lib/ovirt/volume.rb
 - lib/rbovirt.rb
@@ -161,39 +122,43 @@ files:
 - spec/integration/vm_crud_spec.rb
 - spec/lib/endpoint.rb
 - spec/spec_helper.rb
+- spec/unit/client_spec.rb
 - spec/unit/vm_spec.rb
 homepage: http://github.com/abenari/rbovirt
-licenses: 
-- MIT
+licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options: []
-
-require_paths: 
+rdoc_options:
+- --title
+- rbovirt
+- --main
+- README.rdoc
+- --line-numbers
+- --inline-source
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby client for oVirt REST API
-test_files: []
-
+test_files:
+- spec/endpoint.yml.example
+- spec/integration/api_spec.rb
+- spec/integration/vm_crud_spec.rb
+- spec/lib/endpoint.rb
+- spec/spec_helper.rb
+- spec/unit/client_spec.rb
+- spec/unit/vm_spec.rb
+has_rdoc: