rbovirt 0.0.13 → 0.0.14

data/README.rdoc

@@ -12,6 +12,11 @@ A Ruby client for oVirt.
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+== Running the tests
+* Copy the file spec/endpoint.yml.example to spec/endpoint.yml
+* Edit the endpoint properties (user, password and host name)
+* From command line run => rake spec
+
 == Copyright
 
 Copyright (c) 2012 Amos Benari. See LICENSE.txt for

data/Rakefile

@@ -15,7 +15,7 @@ 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.homepage = "http://github.com/rbovirt/rbovirt"
   gem.license = "MIT"
   gem.summary = %Q{A Ruby client for oVirt REST API}
   gem.description = %Q{A Ruby client for oVirt REST API}

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/ovirt/vm.rb

@@ -14,7 +14,17 @@ module OVIRT
     end
 
     def running?
-      !(@status =~ /down/i)
+      !(@status =~ /down/i) && !(@status =~ /wait_for_launch/i)
+    end
+
+    # In oVirt 3.1 a vm can be marked down and not locked while its volumes are locked.
+    # This method indicates if it is safe to launch the vm.
+    def ready?
+      return false unless @status =~ /down/i
+      volumes.each do |volume|
+        return false if volume.status =~ /locked/i
+      end if @client.api_version?("3","1")
+      true
     end
 
     def interfaces
@@ -72,7 +82,7 @@ module OVIRT
           } if(opts[:user_data_method] && opts[:user_data_method] == :custom_property)
           payloads {
             payload(:type => 'floppy') {
-              file(:name => "#{opts[:fileinject_path] || OVIRT::FILEINJECT_PATH}") { content(Base64::decode64(opts[:user_data])) }
+              _file(:name => "#{opts[:fileinject_path] || OVIRT::FILEINJECT_PATH}") { content(Base64::decode64(opts[:user_data])) }
             }
           } if(opts[:user_data_method] && opts[:user_data_method] == :payload)
         }

data/lib/ovirt/volume.rb

@@ -1,7 +1,7 @@
 module OVIRT
 
   class Volume < BaseObject
-    attr_reader :size, :disk_type, :bootable, :interface, :format, :sparse, :storage_domain, :vm
+    attr_reader :size, :disk_type, :bootable, :interface, :format, :sparse, :status, :storage_domain, :vm
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
@@ -34,6 +34,7 @@ module OVIRT
      @interface = (xml/'interface').first.text
      @format = (xml/'format').first.text
      @sparse = (xml/'sparse').first.text
+     @status = (xml/'status').first.text
      @vm = Link::new(@client, (xml/'vm').first[:id], (xml/'vm').first[:href])
     end
 

data/lib/rbovirt.rb

@@ -45,12 +45,13 @@ module OVIRT
     end
 
     def api_version
+      return @api_version unless @api_version.nil?
       xml = http_get("/")/'/api/product_info/version'
-      (xml/'version').first[:major] +"."+ (xml/'version').first[:minor]
+      @api_version = (xml/'version').first[:major] +"."+ (xml/'version').first[:minor]
     end
 
-    def api_version?(major)
-      api_version.split('.')[0] == major
+    def api_version?(major, minor=nil)
+      (api_version.split('.')[0] == major) && (minor.nil? ? true : api_version.split('.')[1] == minor)
     end
 
     def floppy_hook?

data/rbovirt.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rbovirt"
-  s.version = "0.0.13"
+  s.version = File.read('VERSION')
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Benari"]

data/spec/integration/api_spec.rb

@@ -14,12 +14,7 @@ describe OVIRT, "API" do
   # be changed for new major releases.
 
   before(:all) do
-    user="admin@internal"
-    password="123123"
-    hostname = "covirt.sat.lab.tlv.redhat.com"
-    port = "8080"
-    url = "http://#{hostname}:#{port}/api"
-    @blank_template_id = "00000000-0000-0000-0000-000000000000"
+    user, password, url = endpoint
     @client = ::OVIRT::Client.new(user, password, url)
   end
 
@@ -28,7 +23,7 @@ describe OVIRT, "API" do
 
   context 'basic api and listing' do
     it "test_should_return_a_version" do
-      @client.api_version.should eql('3.0')
+      @client.api_version.class.should eql(String)
     end
 
     it "test_should_return_datacenters" do

data/spec/integration/vm_crud_spec.rb

@@ -3,12 +3,7 @@ require "#{File.dirname(__FILE__)}/../spec_helper"
 describe "VM Life cycle" do
 
   before(:all) do
-   user="admin@internal"
-    password="123123"
-    hostname = "covirt.sat.lab.tlv.redhat.com"
-    port = "8080"
-    url = "http://#{hostname}:#{port}/api"
-    @blank_template_id = "00000000-0000-0000-0000-000000000000"
+    user, password, url = endpoint
     @client = ::OVIRT::Client.new(user, password, url)
   end
 
@@ -19,7 +14,7 @@ describe "VM Life cycle" do
       @vm = @client.create_vm(:name => name)
       @client.add_volume(@vm.id)
       @client.add_interface(@vm.id)
-      while @client.vm(@vm.id).status !~ /down/i do
+      while !@client.vm(@vm.id).ready? do
       end
     end
 
@@ -31,7 +26,7 @@ describe "VM Life cycle" 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
+      while !@client.vm(@vm.id).ready? do
       end
       @client.destroy_template(template.id)
     end
@@ -51,6 +46,8 @@ describe "VM Life cycle" do
 
     it "test_should_set_vm_ticket" do
       @client.vm_action(@vm.id, :start)
+      while !@client.vm(@vm.id).running? do
+      end
       @client.set_ticket(@vm.id)
       @client.vm_action(@vm.id, :shutdown)
     end

data/spec/spec_helper.rb

@@ -5,3 +5,9 @@ require 'rspec'
 require 'rbovirt'
 
 module OVIRT::RSpec end
+
+require "#{File.dirname(__FILE__)}/lib/endpoint"
+
+RSpec.configure do |config|
+  config.include OVIRT::RSpec::Endpoint
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors: