rbovirt 0.0.3 → 0.0.4

data/Gemfile

@@ -12,4 +12,5 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+  gem "rspec-rails", "~> 2.6"
 end

data/Rakefile

@@ -32,6 +32,13 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+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'

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/ovirt/cluster.rb

@@ -12,7 +12,7 @@ module OVIRT
 
     def parse_xml_attributes!(xml)
       @description = ((xml/'description').first.text rescue nil)
-      @version =((xml/'version').first[:major].strip rescue nil)
+      @version = parse_version(xml)
       unless (xml/'data_center').empty?
         @datacenter = Link::new(@client, (xml/'data_center').first[:id], (xml/'data_center').first[:href])
       end

data/lib/ovirt/datacenter.rb

@@ -15,7 +15,7 @@ module OVIRT
       @description = (xml/'description').first.text rescue nil
       @status = (xml/'status').first.text.strip
       @storage_type = (xml/'storage_type').first.text
-      @storage_format = (xml/'storage_format').first.text
+      @storage_format = (xml/'storage_format').first.text rescue nil
       @supported_versions = (xml/'supported_versions').collect { |v|
         parse_version v
       }

data/lib/ovirt/{nic.rb → interface.rb}

@@ -1,6 +1,6 @@
 module OVIRT
 
-  class Nic < BaseObject
+  class Interface < BaseObject
     attr_reader :name, :mac, :interface, :network, :vm
 
     def initialize(client, xml)

data/lib/ovirt/template.rb

@@ -8,12 +8,12 @@ module OVIRT
       self
     end
 
-    def self.to_xml(vm_id, opts={})
+    def self.to_xml(opts={})
       builder = Nokogiri::XML::Builder.new do
         template_ {
           name_ opts[:name] || "t-#{Time.now.to_i}"
           description opts[:description] || ''
-          vm(:id => vm_id)
+          vm(:id => opts[:vm])
         }
       end
       Nokogiri::XML(builder.to_xml).root.to_s
@@ -22,9 +22,23 @@ module OVIRT
     private
 
     def parse_xml_attributes!(xml)
-      @description = ((xml/'description').first.text rescue nil)
-      @status = (xml/'status').first.text
+
+      @description = ((xml/'description').first.text rescue '')
+      @status = ((xml/'status').first.text rescue 'unknown')
+      @memory = (xml/'memory').first.text
+      @profile = (xml/'type').first.text
       @cluster = Link::new(@client, (xml/'cluster').first[:id], (xml/'cluster').first[:href])
+      @display = {
+        :type => (xml/'display/type').first.text,
+        :monitors => (xml/'display/monitors').first.text
+      }
+      @cores = ((xml/'cpu/topology').first[:cores] rescue nil)
+      @storage = ((xml/'disks/disk/size').first.text rescue nil)
+      @creation_time = (xml/'creation_time').text
+      @os = {
+          :type => (xml/'os').first[:type],
+          :boot => (xml/'os/boot').collect {|boot| boot[:dev] }
+      }
     end
   end
 end

data/lib/ovirt/vm.rb

@@ -4,30 +4,43 @@ module OVIRT
     FILEINJECT_PATH = "user-data.txt"
 
   class VM < BaseObject
-    attr_reader :description, :status, :memory, :profile, :display, :host, :cluster, :template, :nics
+    attr_reader :description, :status, :memory, :profile, :display, :host, :cluster, :template
     attr_reader :storage, :cores, :creation_time, :os, :ip, :vnc
-    attr_accessor :nics, :disks
+    attr_accessor :interfaces, :volumes
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
       parse_xml_attributes!(xml)
-      self
     end
 
     def running?
-      @status =~ /up/i
+      !(@status =~ /down/i)
     end
 
-    def self.to_xml(template_name, cluster_name, opts={})
+    def interfaces
+      @interfaces ||= @client.interfaces(id)
+    end
+
+    def disks
+      @disks ||= @client.disks(id)
+    end
+
+    def self.to_xml( opts={})
       builder = Nokogiri::XML::Builder.new do
         vm{
           name_ opts[:name] || "i-#{Time.now.to_i}"
-          template_{
-            name_(template_name)
-          }
-          cluster_{
-            name_(cluster_name)
-          }
+          if opts[:template]
+            template_ :id => (opts[:template])
+          elsif opts[:template_name]
+            template_{ name_(opts[:template_name])}
+          else
+            template_{name_('Blank')}
+          end
+          if opts[:cluster]
+            cluster_( :id => opts[:cluster])
+          elsif opts[:cluster_name]
+            cluster_{ name_(opts[:cluster_name])}
+          end
           type_ opts[:hwp_id] || 'Server'
           memory opts[:hwp_memory] ? (opts[:hwp_memory].to_i*1024*1024).to_s : (512*1024*1024).to_s
           cpu {

data/lib/ovirt/{disk.rb → volume.rb}

@@ -1,6 +1,6 @@
 module OVIRT
 
-  class Disk < BaseObject
+  class Volume < BaseObject
     attr_reader :size, :disk_type, :bootable, :interface, :format, :sparse, :storage_domain, :vm
 
     def initialize(client, xml)

data/lib/rbovirt.rb

@@ -5,8 +5,8 @@ require "ovirt/host"
 require "ovirt/storage_domain"
 require "ovirt/template"
 require "ovirt/vm"
-require "ovirt/disk"
-require "ovirt/nic"
+require "ovirt/volume"
+require "ovirt/interface"
 
 require "nokogiri"
 require "rest_client"
@@ -27,26 +27,36 @@ module OVIRT
 
   class Client
 
-    attr_reader :credentials, :api_entrypoint, :datacenter_id
+    attr_reader :credentials, :api_entrypoint, :datacenter_id, :cluster_id
 
-    def initialize(username, password, api_entrypoint, datacenter_id=nil)
+    def initialize(username, password, api_entrypoint, datacenter_id=nil, cluster_id=nil)
       @credentials = { :username => username, :password => password }
       @datacenter_id = datacenter_id
+      @cluster_id = cluster_id
       @api_entrypoint = api_entrypoint
     end
 
     def vm(vm_id, opts={})
       headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
       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]
+      # optional eager loading
+      vm.interfaces = interfaces(vm_id) if opts[:include] && opts[:include].include?(:interfaces)
+      vm.volumes = volumes(vm_id) if opts[:include] && opts[:include].include?(:volumes)
       vm
     end
 
+    def interfaces vm_id
+      http_get("/vms/%s/nics" % vm_id, http_headers).xpath('/nics/nic').collect do |nic|
+        OVIRT::Interface::new(self, nic)
+      end
+    end
+
+    def volumes vm_id
+      http_get("/vms/%s/disks" % vm_id, http_headers).xpath('/disks/disk').collect do |disk|
+        OVIRT::Volume::new(self, disk)
+      end
+    end
+
     def vms(opts={})
       headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
       search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
@@ -65,37 +75,37 @@ module OVIRT
     end
 
     def api_version
-      result_xml = http_get("/")
-      (result_xml/'/api/product_info/version')
+      xml = http_get("/")/'/api/product_info/version'
+      (xml/'version').first[:major] +"."+ (xml/'version').first[:minor]
     end
 
     def api_version?(major)
-      api_version.first[:major].strip == major
+      api_version.split('.')[0] == major
     end
 
     def cluster_version?(cluster_id, major)
-      result_xml = http_get("/clusters/%s" % cluster_id)
-      (result_xml/'/cluster/version').first[:major].strip == major
+      c = cluster(cluster_id)
+      c.version.split('.')[0] == major
     end
 
-    def create_vm(template_name, opts)
-      cluster_name = opts[:cluster_name] || clusters.first.name
-      result_xml = http_post("/vms",OVIRT::VM.to_xml(template_name, cluster_name, opts))
+    def create_vm(opts)
+      opts[:cluster_name] ||= clusters.first.name
+      result_xml = http_post("/vms",OVIRT::VM.to_xml(opts))
       OVIRT::VM::new(self, result_xml.root)
     end
 
-    def add_disk(vm_id, opts={})
+    def add_volume(vm_id, opts={})
       storage_domain_id = opts[:storage_domain] || storagedomains.first.id
-      result_xml = http_post("/vms/%s/disks" % vm_id, OVIRT::Disk.to_xml(storage_domain_id, opts))
+      result_xml = http_post("/vms/%s/disks" % vm_id, OVIRT::Volume.to_xml(storage_domain_id, opts))
     end
 
 
-    def add_nic(vm_id, opts={})
-      http_post("/vms/%s/nics" % vm_id, OVIRT::Nic.to_xml( opts))
+    def add_interface(vm_id, opts={})
+      http_post("/vms/%s/nics" % vm_id, OVIRT::Interface.to_xml( opts))
     end
 
-    def create_template(vm_id, opts)
-      template = http_post("/templates", Template.to_xml(vm_id, opts))
+    def create_template(opts)
+      template = http_post("/templates", Template.to_xml(opts))
       OVIRT::Template::new(self, template.root)
     end
 
@@ -104,7 +114,7 @@ module OVIRT
     end
 
     def templates(opts={})
-      search= opts[:search] || ("datacenter=$s" % current_datacenter.name)
+      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
       http_get("/templates?search=%s" % CGI.escape(search)).xpath('/templates/template').collect do |t|
         OVIRT::Template::new(self, t)
       end.compact
@@ -125,7 +135,7 @@ module OVIRT
 
     def clusters(opts={})
       headers = {:accept => "application/xml; detail=datacenters"}
-      search= opts[:search] || ("datacenter=$s" % current_datacenter.name)
+      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
       http_get("/clusters?search=%s" % CGI.escape(search), headers).xpath('/clusters/cluster').collect do |cl|
         OVIRT::Cluster.new(self, cl)
       end
@@ -141,6 +151,10 @@ module OVIRT
       @current_datacenter ||= self.datacenter_id ? datacenter(self.datacenter_id) : datacenters.first
     end
 
+    def current_cluster
+      @current_cluster ||= self.cluster_id ? cluster(self.cluster_id) : clusters.first
+    end
+
     def datacenter(datacenter_id)
       begin
         datacenter = http_get("/datacenters/%s" % datacenter_id)
@@ -156,7 +170,7 @@ module OVIRT
     end
     
     def hosts(opts={})
-      search= opts[:search] || ("datacenter=$s" % current_datacenter.name)
+      search= opts[:search] || ("datacenter=%s" % current_datacenter.name)
       http_get("/hosts?search=%s" % CGI.escape(search)).xpath('/hosts/host').collect do |h|
         OVIRT::Host::new(self, h)
       end

data/rbovirt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbovirt}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Benari"]
-  s.date = %q{2012-01-18}
+  s.date = %q{2012-01-30}
   s.description = %q{A Ruby client for oVirt REST API}
   s.email = %q{abenari@redhat.com}
   s.extra_rdoc_files = [
@@ -26,16 +26,18 @@ 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/interface.rb",
     "lib/ovirt/storage_domain.rb",
     "lib/ovirt/template.rb",
     "lib/ovirt/vm.rb",
+    "lib/ovirt/volume.rb",
     "lib/rbovirt.rb",
     "rbovirt.gemspec",
-    "test/helper.rb",
-    "test/test_rbovirt.rb"
+    "spec/integration/api_spec.rb",
+    "spec/integration/vm_crud_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/vm_spec.rb"
   ]
   s.homepage = %q{http://github.com/abenari/rbovirt}
   s.licenses = ["MIT"]
@@ -54,6 +56,7 @@ Gem::Specification.new do |s|
       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"])
@@ -61,6 +64,7 @@ Gem::Specification.new do |s|
       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"])
@@ -69,6 +73,7 @@ Gem::Specification.new do |s|
     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
 

data/spec/integration/api_spec.rb

@@ -0,0 +1,55 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+describe OVIRT, "API" do
+
+  # This spec requires the API to be stable, so that projects using
+  # OVIRT do not have to update their code if a new (minor)
+  # version is released.
+  #
+  # API compatibility is only guaranteed for minor version changes;
+  # New major versions may change the API and require code changes
+  # in projects using this plugin.
+  #
+  # Because of the API stability guarantee, these spec's may only
+  # be changed for new major releases.
+
+  before(:all) do
+    user="admin@internal"
+    password="123123"
+    hostname = "ovirt.sat.lab.tlv.redhat.com"
+    port = "8080"
+    url = "http://#{hostname}:#{port}/api"
+    @blank_template_id = "00000000-0000-0000-0000-000000000000"
+    @client = ::OVIRT::Client.new(user, password, url)
+  end
+
+  after(:all) do
+  end
+
+  context 'basic api and listing' do
+    it "test_should_return_a_version" do
+      @client.api_version.should eql('3.0')
+    end
+
+    it "test_should_return_datacenters" do
+      @client.datacenters.class.should eql(Array)
+    end
+
+    it "test_should_return_clusters" do
+      @client.clusters.class.should eql(Array)
+    end
+
+    it "test_should_return_templates" do
+      @client.templates.class.should eql(Array)
+    end
+
+    it "test_should_return_vms" do
+      @client.vms.class.should eql(Array)
+    end
+    it "test_should_return_storage" do
+      @client.storagedomains.class.should eql(Array)
+    end
+
+  end
+
+end

data/spec/integration/vm_crud_spec.rb

@@ -0,0 +1,74 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+describe "VM Life cycle" do
+
+  before(:all) do
+   user="admin@internal"
+    password="123123"
+    hostname = "ovirt.sat.lab.tlv.redhat.com"
+    port = "8080"
+    url = "http://#{hostname}:#{port}/api"
+    @blank_template_id = "00000000-0000-0000-0000-000000000000"
+    @client = ::OVIRT::Client.new(user, password, url)
+  end
+
+  context 'basic vm and templates operations' do
+
+    before(:all) do
+      name = 'vm-'+Time.now.to_i.to_s
+      params = {}
+      params[:name] = name
+      params[:cluster_name] = "test"
+      @vm = @client.create_vm(params)
+      @client.add_volume(@vm.id)
+      @client.add_interface(@vm.id)
+      while @client.vm(@vm.id).status !~ /down/i do
+      end
+    end
+
+    after(:all) do
+      @client.destroy_vm(@vm.id)
+    end
+
+    it "test_should_create_template" do
+      template_name = "test_template"
+      template = @client.create_template(:vm => @vm.id, :name => template_name, :description => "test_template")
+      template.class.to_s.should eql("OVIRT::Template")
+      while @client.vm(@vm.id).status !~ /down/i do
+      end
+      @client.destroy_template(template.id)
+    end
+
+    it "test_should_return_a_template" do
+      @client.template(@blank_template_id).id.should eql(@blank_template_id)
+    end
+
+    it "test_should_return_a_vm" do
+      @client.vm(@vm.id).id.should eql(@vm.id)
+    end
+
+    it "test_should_start_and_stop_vm" do
+      @client.vm_action(@vm.id, :start)
+      @client.vm_action(@vm.id, :shutdown)
+    end
+
+    it "test_should_destroy_vm" do
+      name = 'd-'+Time.now.to_i.to_s
+      params = {}
+      params[:name] = name
+      params[:cluster_name] = "test"
+      vm = @client.create_vm(params)
+      @client.destroy_vm(vm.id)
+    end
+
+    it "test_should_create_a_vm" do
+      name = 'c-'+Time.now.to_i.to_s
+      params = {}
+      params[:name] = name
+      params[:cluster_name] = "test"
+      vm = @client.create_vm(params)
+      vm.class.to_s.should eql("OVIRT::VM")
+      @client.destroy_vm(vm.id)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+#require 'rubygems'
+#require 'bundler/setup'
+
+require 'rspec'
+require 'rbovirt'
+
+module OVIRT::RSpec end

data/spec/unit/vm_spec.rb

@@ -0,0 +1,88 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+
+describe OVIRT::VM do
+
+  context 'xml parsing' do
+    before(:all) do
+      @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
+
+    it "should parse VM xml" do
+      vm = OVIRT::VM.new(nil, Nokogiri::XML(@xml).xpath('/'))
+      vm.class.should eql(OVIRT::VM)
+    end
+
+    it "create vm xml" do
+      opts = {:cluster_name=>'cluster', :template_name =>'template'}
+      xml = OVIRT::VM.to_xml(opts)
+      xml.nil?.should eql(false)
+    end
+
+    it "should be running" do
+      vm = OVIRT::VM.new(nil, Nokogiri::XML(@xml).xpath('/'))
+      vm.running?.should eql(true)
+    end
+
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbovirt
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Amos Benari
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 +02:00
+date: 2012-01-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,21 @@ dependencies:
         version: "0"
   requirement: *id006
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec-rails
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  requirement: *id007
+  type: :development
 description: A Ruby client for oVirt REST API
 email: abenari@redhat.com
 executables: []
@@ -125,16 +140,18 @@ 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/interface.rb
 - lib/ovirt/storage_domain.rb
 - lib/ovirt/template.rb
 - lib/ovirt/vm.rb
+- lib/ovirt/volume.rb
 - lib/rbovirt.rb
 - rbovirt.gemspec
-- test/helper.rb
-- test/test_rbovirt.rb
+- spec/integration/api_spec.rb
+- spec/integration/vm_crud_spec.rb
+- spec/spec_helper.rb
+- spec/unit/vm_spec.rb
 has_rdoc: true
 homepage: http://github.com/abenari/rbovirt
 licenses: 

data/test/helper.rb

@@ -1,18 +0,0 @@
-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 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rbovirt'
-
-class Test::Unit::TestCase
-end

data/test/test_rbovirt.rb

@@ -1,112 +0,0 @@
-require 'helper'
-
-class TestRbovirt < Test::Unit::TestCase
-
-  def setup
-    user="admin@internal"
-    password="123123"
-    hostname = "ovirt.sat.lab.tlv.redhat.com"
-    port = "8080"
-    url = "http://#{hostname}:#{port}/api"
-    @blank_template_id = "00000000-0000-0000-0000-000000000000"
-    @client = ::OVIRT::Client.new(user, password, url)
-  end
-
-  def test_should_return_a_version
-    assert @client.api_version
-  end
-
-  def test_should_return_datacenters
-    assert @client.datacenters
-  end
-
-  def test_should_return_clusters
-    assert @client.clusters
-  end
-
-  def test_should_return_templates
-    assert @client.templates
-  end
-
-  def test_should_create_template
-    name = 't'+Time.now.to_i.to_s
-    params = {}
-    params[:name] = name
-    params[:cluster_name] = "test"
-    vm = @client.create_vm("Blank",params)
-
-    @client.add_disk(vm.id)
-    @client.add_nic(vm.id)
-    while @client.vm(vm.id).status !~ /down/i do
-    end
-    template_name = "test_template"
-    assert template = @client.create_template(vm.id, :name => template_name, :description => "test_template")
-    while @client.vm(vm.id).status !~ /down/i do
-    end
-    assert @client.destroy_template(template.id)
-    @client.destroy_vm(vm.id)
-  end
-
-  def test_should_return_a_template
-    assert @client.template(@blank_template_id)
-  end
-
-
-  def test_should_return_vms
-    assert @client.vms
-  end
-
-  def test_should_return_a_vm
-    name = 'a'+Time.now.to_i.to_s
-    params = {}
-    params[:name] = name
-    params[:cluster_name] = "test"
-    vm = @client.create_vm("Blank",params)
-    assert @client.vm(vm.id)
-    @client.destroy_vm(vm.id)
-  end
-
-  def test_should_start_vm
-    name = 'r'+Time.now.to_i.to_s
-    params = {}
-    params[:name] = name
-    params[:cluster_name] = "test"
-    vm = @client.create_vm("Blank",params)
-    @client.add_disk(vm.id)
-    @client.add_nic(vm.id)
-    while @client.vm(vm.id).status !~ /down/i do
-    end  
-    assert @client.vm_action(vm.id, :start)
-    @client.vm_action(vm.id, :shutdown)
-    while @client.vm(vm.id).status !~ /down/i do
-    end
-    @client.destroy_vm(vm.id)
-  end
-
-  def test_should_stop_vm
-
-  end
-
-  def test_should_destroy_vm
-    name = 'd'+Time.now.to_i.to_s
-    params = {}
-    params[:name] = name
-    params[:cluster_name] = "test"
-    vm = @client.create_vm("Blank",params)
-    assert @client.destroy_vm(vm.id)
-  end
-
-  def test_should_return_storage
-    assert @client.storagedomains
-  end
-
-  def test_should_create_a_vm
-    name = 'c'+Time.now.to_i.to_s
-    params = {}
-    params[:name] = name
-    params[:cluster_name] = "test"
-    assert vm = @client.create_vm("Blank",params)
-    @client.destroy_vm(vm.id)
-  end
-
-end