rbovirt 0.0.38 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c42e5b1c5f43a076a769257cc35bbff0d1a7dc48
-  data.tar.gz: 068e70e837abc2f7606218df4ff6bd4d39b3c57e
+  metadata.gz: 37364775867c2c85d2ce024df84520d268709c11
+  data.tar.gz: cfc11b0e00842a67a37aaf00402313af04f13564
 SHA512:
-  metadata.gz: 639c692ca2f804a5a16da355099d25f4c3d089ed28923132ca112d51f8bf5eb3711b27e1499843754f1995c6dffe5f820cfc94b38e16d0dee5494378d3c88051
-  data.tar.gz: 5634a599a70eb748f8e31a88bafb5979413ef39e51228a41d35e0814f634f9043fd15ddff999eaae7f3f6f6e0962ea0eaeee8ccf335df1a54de6372b17354dba
+  metadata.gz: fd9cd881cc6a1da9e596830af2d73af02bd21ef48abd6f29fd0da7428e9297bfdb1d10fe33424f671198ce6a9badd5dbb9c885e504897f70b19050700f067224
+  data.tar.gz: 2d347cf659fe0f17ede50ed5f99efe143dff113f03f4e0d1484a08b3f65cee14b8da7bc643eabd60444d1a83592366ef138ece1c7245b5d9b54aa4796c1f0e74

data/CHANGES.rdoc

@@ -6,6 +6,22 @@ _rbovirt_ project.
 Note that this list of changes was added with the 0.0.30 release,
 previous releases aren't described here.
 
+== 0.1.0 / 2015-05-07
+
+New features:
+
+* Updated the Ruby required version to 1.9.3.
+* Updated the _rest_client_ required version to 1.7.0.
+* Added +wipe_after_delete+ flag for volumes.
+* Added +comment+ attribute to VMs.
+* Added +clone+ attribute to VMs in order to support creation of full
+  clones.
+* Added +ha_priority+ attribute to VMs.
+* Added support for the top level +disks+ collection (also known as
+  floating disks).
+* Added +alias+ attribute to volumes.
+* Added support for affinity groups.
+
 == 0.0.32 / 2015-01-14
 
 New features:

data/lib/client/disk_profile_api.rb

@@ -0,0 +1,16 @@
+module OVIRT
+  class Client
+    def diskprofile(dp_id)
+      dp = http_get("/diskprofiles/%s" % dp_id)
+      OVIRT::DiskProfile::new(self, dp.root)
+    end
+
+    def diskprofiles(opts={})
+      path = "/diskprofiles"
+      path += search_url(opts) unless filtered_api
+      http_get(path).xpath('/disk_profiles/disk_profile').collect do |dp|
+        OVIRT::DiskProfile::new(self,dp)
+      end.compact
+    end
+  end
+end

data/lib/client/vm_api.rb

@@ -6,11 +6,7 @@ module OVIRT
     end
 
     def vms(opts={})
-      if opts[:without_details]
-        headers = {:accept => "application/xml"}
-      else
-        headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
-      end
+      headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
       path = "/vms"
       path += search_url(opts) unless filtered_api
       http_get(path, headers).xpath('/vms/vm').collect do |vm|
@@ -23,7 +19,9 @@ module OVIRT
 
       if opts[:user_data] and not opts[:user_data].empty?
         if api_version?('3') and cluster_major_ver >= 3
-          if cluster_minor_ver >= 1
+          if cluster_minor_ver >= 3
+            opts[:user_data_method] = :payload_v3_3
+          elsif cluster_minor_ver >= 1
             opts[:user_data_method] = :payload
           elsif floppy_hook?
             opts[:user_data_method] = :custom_property

data/lib/ovirt/disk_profile.rb

@@ -0,0 +1,16 @@
+module OVIRT
+  class DiskProfile < BaseObject
+    def initialize(client, xml)
+      super(client, xml[:id], xml[:href], (xml/'name').first.text)
+      parse_xml_attributes!(xml)
+      self
+    end
+
+    private
+    def parse_xml_attributes!(xml)
+      @disk_profile = ((xml/'disk_profile').first[:id] rescue nil)
+      @name = ((xml/'name').first.text rescue nil)
+      @storage_domain = ((xml/'storagedomains').first[:id] rescue nil)
+    end
+  end
+end

data/lib/ovirt/template.rb

@@ -1,6 +1,6 @@
 module OVIRT
   class Template < BaseObject
-    attr_reader :description, :status, :cluster, :creation_time, :os, :storage, :display, :profile, :memory, :version
+    attr_reader :description, :comment, :status, :cluster, :creation_time, :os, :storage, :display, :profile, :memory, :version
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
@@ -13,6 +13,7 @@ module OVIRT
         template_ {
           name_ opts[:name] || "t-#{Time.now.to_i}"
           description opts[:description] || ''
+          comment opts[:comment] || ''
           vm(:id => opts[:vm])
         }
       end
@@ -30,14 +31,15 @@ module OVIRT
     private
     def parse_xml_attributes!(xml)
       @description = ((xml/'description').first.text rescue '')
+      @comment = ((xml/'comment').first.text rescue '')
       @version = TemplateVersion.new((xml/'version').first)
       @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 rescue ''),
-        :monitors => ((xml/'display/monitors').first.text rescue 0)
+        :type => (xml/'display/type').first.text,
+        :monitors => (xml/'display/monitors').first.text
       }
       @cores = ((xml/'cpu/topology').first[:cores].to_i * (xml/'cpu/topology').first[:sockets].to_i rescue nil)
       @storage = ((xml/'disks/disk/size').first.text rescue nil)

data/lib/ovirt/template_version.rb

@@ -8,7 +8,7 @@ module OVIRT
     def parse_xml_attributes(xml)
       @base_template = (xml/"base_template").first[:id]
       @version_number = (xml/"version_number").first.text
-      @version_name = ((xml/"version_name").first.text rescue nil)
+      @version_name = (xml/"version_name").first.text
     end
   end
-end
+end

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module OVIRT
-  VERSION = "0.0.38"
+  VERSION = "0.1.0"
 end

data/lib/ovirt/vm.rb

@@ -4,8 +4,8 @@ module OVIRT
     FILEINJECT_PATH = "user-data.txt"
 
   class VM < BaseObject
-    attr_reader :description, :status, :memory, :profile, :display, :host, :cluster, :template
-    attr_reader :storage, :cores, :creation_time, :os, :ips, :vnc, :quota
+    attr_reader :description, :comment, :status, :memory, :profile, :display, :host, :cluster, :template
+    attr_reader :storage, :cores, :creation_time, :os, :ha, :ha_priority, :ips, :vnc, :quota, :clone
     attr_accessor :interfaces, :volumes
 
     def initialize(client, xml)
@@ -50,6 +50,9 @@ module OVIRT
       builder = Nokogiri::XML::Builder.new do
         vm{
           name_ opts[:name] || "i-#{Time.now.to_i}"
+          if opts[:comment]
+            comment_ opts[:comment]
+          end
           if opts[:template] && !opts[:template].empty?
             template_ :id => (opts[:template])
           elsif opts[:template_name] && !opts[:template_name].empty?
@@ -76,24 +79,26 @@ module OVIRT
           end
           # os element must not be sent when template is present (RHBZ 1104235)
           if opts[:template].nil? || opts[:template].empty?
-            os_opts = opts[:os] ? opts[:os].dup : {}
-            os_opts[:type] ||= opts[:os_type] || 'unassigned'
-            os_opts[:boot] ||= [opts.fetch(:boot_dev1, 'network'), opts.fetch(:boot_dev2, 'hd')]
-            os_opts[:kernel] ||= opts[:os_kernel]
-            os_opts[:initrd] ||= opts[:os_initrd]
-            os_opts[:cmdline] ||= opts[:os_cmdline]
-            if opts[:first_boot_dev]
-              os_opts[:boot] = os_opts[:boot].sort_by.with_index do |device, index|
-                device == opts[:first_boot_dev] ? -1 : index
+            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
+                boot(:dev=> opts[:boot_dev2] || 'hd')
+                boot(:dev=> opts[:boot_dev1] || 'network')
               end
-            end
-            os(:type => os_opts[:type]) do
-              os_opts[:boot].each { |device| boot(:dev => device) }
-              kernel os_opts[:kernel]
-              initrd os_opts[:initrd]
-              cmdline os_opts[:cmdline]
-            end
+              kernel (opts[:os_kernel])
+              initrd (opts[:os_initrd])
+              cmdline (opts[:os_cmdline])
+            }
+          end
+          if !opts[:ha].nil? || !opts[:ha_priority].nil?
+            high_availability_{
+              enabled_(opts[:ha]) unless opts[:ha].nil?
+              priority_(opts[:ha_priority]) unless opts[:ha_priority].nil?
+            }
           end
+          disks_ { clone_(opts[:clone]) } if opts[:clone]
           display_{
             type_(opts[:display][:type])
           } if opts[:display]
@@ -108,6 +113,16 @@ module OVIRT
               file(:name => "#{opts[:fileinject_path] || OVIRT::FILEINJECT_PATH}") { content(Base64::decode64(opts[:user_data])) }
             }
           } if(opts[:user_data_method] && opts[:user_data_method] == :payload)
+          payloads {
+            payload(:type => 'floppy') {
+              files {
+                file {
+                  name_ "#{opts[:fileinject_path] || OVIRT::FILEINJECT_PATH}"
+                  content Base64::decode64(opts[:user_data])
+                }
+              }
+            }
+          } if(opts[:user_data_method] && opts[:user_data_method] == :payload_v3_3)
         }
       end
       Nokogiri::XML(builder.to_xml).root.to_s
@@ -121,6 +136,7 @@ module OVIRT
       gateway             = opts[:gateway]
       domain              = opts[:domain]
       nicname             = opts[:nicname]
+      user                = opts[:user] || 'root'
       password            = opts[:password]
       ssh_authorized_keys = opts[:ssh_authorized_keys]
       fileslist           = opts[:files]
@@ -163,7 +179,7 @@ module OVIRT
                 unless password.nil?
                   users { 
                     user {  
-                      user_name 'root'
+                      user_name user
                       password password
                     }
                   }
@@ -171,13 +187,13 @@ module OVIRT
                 unless ssh_authorized_keys.nil?
                   authorized_keys {
                     authorized_key {
-                      user { user_name 'root' }
+                      user { user_name user }
                       ssh_authorized_keys.each do |sshkey|
                         key sshkey    
                       end
                     }
                   }
-	        end
+                end
                 network_configuration { 
                   unless nicname.nil?
                     nics {
@@ -206,7 +222,7 @@ module OVIRT
                 }
               regenerate_ssh_keys 'true'
               files {
-	        unless extracmd.nil?
+                unless extracmd.nil?
                   file {
                     name_   'ignored'
                     content extracmd
@@ -235,6 +251,7 @@ module OVIRT
 
     def parse_xml_attributes!(xml)
       @description = ((xml/'description').first.text rescue '')
+      @comment = ((xml/'comment').first.text rescue '')
       @status = ((xml/'status').first.text rescue 'unknown')
       @memory = (xml/'memory').first.text
       @profile = (xml/'type').first.text
@@ -242,12 +259,12 @@ module OVIRT
       @host = Link::new(@client, (xml/'host').first[:id], (xml/'host').first[:href]) rescue nil
       @cluster = Link::new(@client, (xml/'cluster').first[:id], (xml/'cluster').first[:href])
       @display = {
-        :type => ((xml/'display/type').first.text rescue ''),
+        :type => (xml/'display/type').first.text,
         :address => ((xml/'display/address').first.text rescue nil),
         :port => ((xml/'display/port').first.text rescue nil),
         :secure_port => ((xml/'display/secure_port').first.text rescue nil),
         :subject => ((xml/'display/certificate/subject').first.text rescue nil),
-        :monitors => ((xml/'display/monitors').first.text rescue 0)
+        :monitors => (xml/'display/monitors').first.text
       }
       @cores = ((xml/'cpu/topology').first[:cores].to_i * (xml/'cpu/topology').first[:sockets].to_i rescue nil)
       @storage = ((xml/'disks/disk/size').first.text rescue nil)
@@ -261,6 +278,8 @@ module OVIRT
           :type => (xml/'os').first[:type],
           :boot => (xml/'os/boot').collect {|boot| boot[:dev] }
       }
+      @ha = ((xml/'high_availability/enabled').first.text rescue nil)
+      @ha_priority = ((xml/'high_availability/priority').first.text rescue nil)
       @quota = ((xml/'quota').first[:id] rescue nil)
 
       disks = xml/'disks/disk'
@@ -268,6 +287,8 @@ module OVIRT
 
       interfaces = xml/'nics/nic'
       @interfaces = interfaces.length > 0 ? interfaces.collect {|nic| OVIRT::Interface::new(@client, nic)} : nil
+
+      @clone = ((xml/'disks/clone').first.text rescue nil)
     end
 
   end

data/lib/ovirt/volume.rb

@@ -1,7 +1,7 @@
 module OVIRT
 
   class Volume < BaseObject
-    attr_reader :size, :disk_type, :bootable, :interface, :format, :sparse, :status, :storage_domain, :vm, :quota, :alias
+    attr_reader :size, :disk_type, :bootable, :interface, :format, :sparse, :status, :storage_domain, :vm, :quota, :alias, :disk_profile
 
     def initialize(client, xml)
       super(client, xml[:id], xml[:href], (xml/'name').first.text)
@@ -26,6 +26,9 @@ module OVIRT
           if opts[:bootable]
             bootable_(opts[:bootable])
           end
+          if opts[:disk_profile]
+             disk_profile_(:id => opts[:disk_profile])
+          end
           if opts[:interface]
             interface_(opts[:interface])
           end
@@ -41,6 +44,9 @@ module OVIRT
           if opts[:alias]
             alias_(opts[:alias])
           end
+          if opts[:wipe_after_delete]
+            wipe_after_delete(opts[:wipe_after_delete])
+          end
         }
       end
       Nokogiri::XML(builder.to_xml).root.to_s
@@ -55,9 +61,11 @@ module OVIRT
      @format = ((xml/'format').first.text rescue nil)
      @sparse = ((xml/'sparse').first.text rescue nil)
      @status = ((xml/'status/state').first.text rescue nil)
+     @disk_profile = Link::new(@client, (xml/'disk_profile').first[:id], (xml/'disk_profile').first[:href]) rescue nil
      @vm = Link::new(@client, (xml/'vm').first[:id], (xml/'vm').first[:href]) rescue nil
      @quota = ((xml/'quota').first[:id] rescue nil)
      @alias = ((xml/'alias').first.text rescue nil)
+     @wipe_after_delete = ((xml/'wipe_after_delete').first.text rescue nil)
     end
 
   end

data/lib/rbovirt.rb

@@ -3,6 +3,7 @@ require "ovirt/cluster"
 require "ovirt/datacenter"
 require "ovirt/host"
 require "ovirt/storage_domain"
+require "ovirt/disk_profile"
 require "ovirt/template"
 require "ovirt/template_version"
 require "ovirt/vm"
@@ -11,9 +12,7 @@ require "ovirt/interface"
 require "ovirt/network"
 require "ovirt/quota"
 require "ovirt/affinity_group"
-require "ovirt/instance_type"
 require "ovirt/version"
-require "ovirt/operating_system"
 
 require "client/vm_api"
 require "client/template_api"
@@ -24,12 +23,10 @@ require "client/storage_domain_api"
 require "client/quota_api"
 require "client/disk_api"
 require "client/affinity_group_api"
-require "client/instance_type_api"
-require "client/operating_system_api"
+require "client/disk_profile_api"
 
 require "nokogiri"
 require "rest_client"
-require "restclient_ext/request"
 require "restclient_ext/resource"
 
 module OVIRT
@@ -48,7 +45,7 @@ module OVIRT
 
   class Client
 
-    attr_reader :credentials, :api_entrypoint, :datacenter_id, :cluster_id, :filtered_api, :ca_cert_file, :ca_cert_store, :ca_no_verify, :persistent_auth, :jsessionid
+    attr_reader :credentials, :api_entrypoint, :datacenter_id, :cluster_id, :filtered_api, :ca_cert_file, :ca_cert_store, :ca_no_verify
 
     # Construct a new ovirt client class.
     # mandatory parameters
@@ -70,16 +67,14 @@ module OVIRT
                    :cluster_id => backward_compatibility_cluster,
                    :filtered_api => backward_compatibility_filtered}
       end
-      @api_entrypoint  = api_entrypoint
-      @credentials     = { :username => username, :password => password }
-      @datacenter_id   = options[:datacenter_id]
-      @cluster_id      = options[:cluster_id]
-      @filtered_api    = options[:filtered_api]
-      @ca_cert_file    = options[:ca_cert_file]
-      @ca_cert_store   = options[:ca_cert_store]
-      @ca_no_verify    = options[:ca_no_verify]
-      @persistent_auth = options[:persistent_auth]
-      @jsessionid      = options[:jsessionid]
+      @api_entrypoint = api_entrypoint
+      @credentials    = { :username => username, :password => password }
+      @datacenter_id  = options[:datacenter_id]
+      @cluster_id     = options[:cluster_id]
+      @filtered_api   = options[:filtered_api]
+      @ca_cert_file   = options[:ca_cert_file]
+      @ca_cert_store  = options[:ca_cert_store]
+      @ca_no_verify   = options[:ca_no_verify]
     end
 
     def api_version
@@ -98,13 +93,9 @@ module OVIRT
     end
 
     private
-
     def search_url opts
-      search = opts[:search] || ''
-      search += " datacenter=\"%s\"" % current_datacenter.name
-      search += " page #{opts[:page]}" if opts[:page]
-      max = opts[:max] ? ";max=#{opts[:max]}" : ''
-      "#{max}?search=#{CGI.escape(search)}"
+      search = opts[:search] || ("datacenter=%s" % current_datacenter.name)
+      "?search=%s" % CGI.escape(search)
     end
 
     def current_datacenter
@@ -117,7 +108,9 @@ module OVIRT
 
     def http_get(suburl, headers={})
       begin
-        handle_success(rest_client(suburl).get(http_headers(headers)))
+        res = rest_client(suburl).get(http_headers(headers))
+        puts "#{res}\n" if ENV['RBOVIRT_LOG_RESPONSE']
+        Nokogiri::XML(res)
       rescue
         handle_fault $!
       end
@@ -125,7 +118,9 @@ module OVIRT
 
     def http_post(suburl, body, headers={})
       begin
-        handle_success(rest_client(suburl).post(body, http_headers(headers)))
+        res = rest_client(suburl).post(body, http_headers(headers))
+        puts "#{res}\n" if ENV['RBOVIRT_LOG_RESPONSE']
+        Nokogiri::XML(res)
       rescue
         handle_fault $!
       end
@@ -133,7 +128,9 @@ module OVIRT
 
     def http_put(suburl, body, headers={})
       begin
-        handle_success(rest_client(suburl).put(body, http_headers(headers)))
+        res = rest_client(suburl).put(body, http_headers(headers))
+        puts "#{res}\n" if ENV['RBOVIRT_LOG_RESPONSE']
+        Nokogiri::XML(res)
       rescue
         handle_fault $!
       end
@@ -142,8 +139,10 @@ module OVIRT
     def http_delete(suburl, body=nil, headers={})
       begin
         headers = body ? http_headers(headers) :
-          {:accept => 'application/xml', :version => '3'}.merge(auth_header).merge(filter_header)
-        handle_success(rest_client(suburl).delete_with_payload(body, headers))
+          {:accept => 'application/xml'}.merge(auth_header).merge(filter_header)
+        res = rest_client(suburl).delete_with_payload(body, headers)
+        puts "#{res}\n" if ENV['RBOVIRT_LOG_RESPONSE']
+        Nokogiri::XML(res)
       rescue
         handle_fault $!
       end
@@ -152,12 +151,7 @@ module OVIRT
     def auth_header
       # This is the method for strict_encode64:
       encoded_credentials = ["#{@credentials[:username]}:#{@credentials[:password]}"].pack("m0").gsub(/\n/,'')
-      headers = { :authorization => "Basic " + encoded_credentials }
-      if persistent_auth
-        headers[:prefer] = 'persistent-auth'
-        headers[:cookie] = "JSESSIONID=#{jsessionid}" if jsessionid
-      end
-      headers
+      { :authorization => "Basic " + encoded_credentials }
     end
 
     def rest_client(suburl)
@@ -192,16 +186,9 @@ module OVIRT
       filter_header.merge(auth_header).merge({
         :content_type => 'application/xml',
         :accept => 'application/xml',
-        :version => '3',
       }).merge(headers)
     end
 
-    def handle_success(response)
-      puts "#{response}\n" if ENV['RBOVIRT_LOG_RESPONSE']
-      @jsessionid ||= response.cookies['JSESSIONID']
-      Nokogiri::XML(response)
-    end
-
     def handle_fault(f)
       if f.is_a?(RestClient::BadRequest) || f.is_a?(RestClient::Conflict)
         fault = (Nokogiri::XML(f.http_body)/'//fault/detail')

data/rbovirt.gemspec

@@ -21,11 +21,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency('nokogiri')
-  gem.add_runtime_dependency('rest-client')
+  gem.add_runtime_dependency('rest-client', '> 1.7.0')
   gem.add_development_dependency('shoulda')
   gem.add_development_dependency('rspec-rails', '~> 2.6')
   gem.add_development_dependency('rake')
 
+  gem.required_ruby_version = '>= 1.9.3'
+
   gem.rdoc_options << '--title' << gem.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
   gem.extra_rdoc_files = ['README.rdoc', 'CHANGES.rdoc']
 end

data/spec/integration/api_spec.rb

@@ -58,28 +58,6 @@ describe OVIRT, "Https authentication" do
   end
 end
 
-describe OVIRT, "Persistent authentication" do
-  context 'use persistent authentication' do
-
-    it "test_request_with_persistent_authentication" do
-      user, password, url, datacenter = endpoint
-      cert = ca_cert(url)
-      store = OpenSSL::X509::Store.new().add_cert(
-              OpenSSL::X509::Certificate.new(cert))
-
-      client = ::OVIRT::Client.new(user, password, url, {:ca_cert_store => store, :persistent_auth => true})
-      client.api_version.class.should eql(String)
-      client.persistent_auth.should eql(true)
-      client.jsessionid.should_not be_nil
-
-      # When performing a new request the jsessionid should remain the same
-      orig_jsession_id = client.jsessionid
-      client.datacenters.class.should eql(Array)
-      client.jsessionid.should eql(orig_jsession_id)
-    end
-  end
-end
-
 describe OVIRT, "Admin API" do
 
   before(:all) do

data/spec/integration/vm_crud_spec.rb

@@ -19,7 +19,7 @@ shared_examples_for "Basic VM Life cycle" do
 
   it "test_should_create_template" do
     template_name = "tmplt-"+Time.now.to_i.to_s
-    template = @client.create_template(:vm => @vm.id, :name => template_name, :description => "test_template")
+    template = @client.create_template(:vm => @vm.id, :name => template_name, :description => "test_template", :comment => "test_template")
     template.class.to_s.should eql("OVIRT::Template")
     while !@client.vm(@vm.id).ready? do
     end
@@ -42,8 +42,6 @@ shared_examples_for "Basic VM Life cycle" do
   end
 
   it "test_should_start_with_cloudinit" do
-    while @client.vm(@vm.id).status.strip != 'down' do
-    end
     hostname = "host-"+Time.now.to_i.to_s
     user_data={ :hostname => hostname }
     @client.vm_start_with_cloudinit(@vm.id, user_data)
@@ -53,8 +51,6 @@ shared_examples_for "Basic VM Life cycle" do
   end
 
   it "test_should_set_vm_ticket" do
-    while @client.vm(@vm.id).status.strip != 'down' do
-    end
     @client.vm_action(@vm.id, :start)
     while !@client.vm(@vm.id).running? do
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.1.0
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,16 +28,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "    A Ruby client for oVirt REST API\n"
+description: |2
+      A Ruby client for oVirt REST API
 email:
 - abenari@redhat.com
 executables: []
@@ -100,9 +101,8 @@ files:
 - lib/client/cluster_api.rb
 - lib/client/datacenter_api.rb
 - lib/client/disk_api.rb
+- lib/client/disk_profile_api.rb
 - lib/client/host_api.rb
-- lib/client/instance_type_api.rb
-- lib/client/operating_system_api.rb
 - lib/client/quota_api.rb
 - lib/client/storage_domain_api.rb
 - lib/client/template_api.rb
@@ -111,11 +111,10 @@ files:
 - lib/ovirt/base_object.rb
 - lib/ovirt/cluster.rb
 - lib/ovirt/datacenter.rb
+- lib/ovirt/disk_profile.rb
 - lib/ovirt/host.rb
-- lib/ovirt/instance_type.rb
 - lib/ovirt/interface.rb
 - lib/ovirt/network.rb
-- lib/ovirt/operating_system.rb
 - lib/ovirt/quota.rb
 - lib/ovirt/storage_domain.rb
 - lib/ovirt/template.rb
@@ -124,17 +123,14 @@ files:
 - lib/ovirt/vm.rb
 - lib/ovirt/volume.rb
 - lib/rbovirt.rb
-- lib/restclient_ext/request.rb
 - lib/restclient_ext/resource.rb
 - rbovirt.gemspec
 - spec/endpoint.yml.example
 - spec/integration/api_spec.rb
-- spec/integration/instance_type_spec.rb
 - spec/integration/vm_crud_spec.rb
 - spec/spec_helper.rb
 - spec/unit/client_spec.rb
 - spec/unit/vm_spec.rb
-- spec/unit/volume_spec.rb
 homepage: http://github.com/abenari/rbovirt
 licenses:
 - MIT
@@ -153,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -161,16 +157,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client for oVirt REST API
 test_files:
 - spec/endpoint.yml.example
 - spec/integration/api_spec.rb
-- spec/integration/instance_type_spec.rb
 - spec/integration/vm_crud_spec.rb
 - spec/spec_helper.rb
 - spec/unit/client_spec.rb
 - spec/unit/vm_spec.rb
-- spec/unit/volume_spec.rb

data/lib/client/instance_type_api.rb

@@ -1,20 +0,0 @@
-module OVIRT
-  class Client
-    def instance_type(instance_type_id)
-        begin
-          instance_type = http_get("/instancetypes/%s" % instance_type_id)
-          OVIRT::InstanceType::new(self, instance_type.root)
-        rescue
-          handle_fault $!
-        end
-      end
-
-      def instance_types(opts={})
-        search = opts[:search] ||""
-        instance_types = http_get("/instancetypes?search=%s" % CGI.escape(search))
-        instance_types.xpath('/instance_types/instance_type').collect do |it|
-          OVIRT::InstanceType::new(self, it)
-        end
-      end
-  end
-end

data/lib/client/operating_system_api.rb

@@ -1,10 +0,0 @@
-module OVIRT
-  class Client
-    def operating_systems
-      operating_systems = http_get('/operatingsystems')
-      operating_systems.xpath('/operating_systems/operating_system').collect do |os|
-        OVIRT::OperatingSystem::new(self, os)
-      end
-    end
-  end
-end

data/lib/ovirt/instance_type.rb

@@ -1,73 +0,0 @@
-module OVIRT
-  # Instance types are added to oVirt 3.5 and have been updated in oVirt 3.6
-  class InstanceType < BaseObject
-    # Common attributes to all oVirt version supported at this time
-    attr_reader :name, :description, :memory, :cores, :os, :creation_time
-    attr_reader :ha, :ha_priority, :display, :usb, :migration_downtime
-
-    # oVirt 3.5 attributes
-    attr_reader :type, :status, :cpu_shares, :boot_menu, :origin, :stateless
-    attr_reader :delete_protected, :sso, :timezone
-
-    # oVirt 3.6 attributes
-    attr_reader :migration, :io_threads, :memory_guaranteed
-
-    def initialize(client, xml)
-      super(client, xml[:id], xml[:href], (xml/'name').first.text)
-      parse_xml_attributes!(xml)
-      self
-    end
-
-    private
-    def parse_xml_attributes!(xml)
-      # Common attributes
-      @description = ((xml/'description').first.text rescue '')
-      @memory = (xml/'memory').first.text
-      @cores = ((xml/'cpu/topology').first[:cores].to_i * (xml/'cpu/topology').first[:sockets].to_i rescue nil)
-      @os = {
-          :type => (xml/'os').first[:type],
-          :boot => (xml/'os/boot').collect {|boot| boot[:dev] }
-      }
-      @creation_time = (xml/'creation_time').text
-      @ha = parse_bool((xml/'high_availability/enabled').first.text)
-      @ha_priority = ((xml/'high_availability/priority').first.text rescue nil)
-      @display = {
-        :type => (xml/'display/type').first.text,
-        :monitors => (xml/'display/monitors').first.text,
-        :single_qxl_pci => parse_bool((xml/'display/single_qxl_pci').first.text),
-        :smartcard_enabled => parse_bool((xml/'display/smartcard_enabled').first.text),
-
-      }
-      @usb = parse_bool((xml/'usb/enabled').first.text)
-      @migration_downtime = ((xml/'migration_downtime').first.text)
-
-      # oVirt 3.5 attributes
-      @type = ((xml/'type').first.text rescue nil)
-      @status = ((xml/'status').first.text rescue nil)
-      @cpu_shares = (((xml/'cpu_shares').first.text) rescue nil)
-      potential_bool = ((xml/'bios/boot_menu/enabled').first.text rescue nil)
-      @boot_menu = potential_bool.nil? ? nil : parse_bool(potential_bool)
-      @origin = ((xml/'origin').text rescue nil)
-      potential_bool = ((xml/'stateless').first.text rescue nil)
-      @stateless = potential_bool.nil? ? nil : parse_bool(potential_bool)
-      potential_bool = ((xml/'delete_protected').first.text rescue nil)
-      @delete_protected = potential_bool.nil? ? nil : parse_bool(potential_bool)
-      #@sso = ((xml/'sso/methods').first.text rescue nil)
-      @timezone = ((xml/'timezone').first.text rescue nil)
-      potential_bool = ((xml/'display/allow_override').first.text rescue nil)
-      @display[:allow_override] = potential_bool.nil? ? nil : parse_bool(potential_bool)
-      potential_bool = ((xml/'display/file_transfer_enabled').first.text rescue nil)
-      @display[:file_transfer_enabled] = potential_bool.nil? ? nil : parse_bool(potential_bool)
-      potential_bool = ((xml/'display/copy_paste_enabled').first.text rescue nil)
-      @display[:copy_paste_enabled] = potential_bool.nil? ? nil : parse_bool(potential_bool)
-
-      # oVirt 3.6 attributes
-      @migration = {
-        :auto_converge => ((xml/'migration/auto_converge').first.text rescue nil),
-        :compressed => ((xml/'migration/compressed').first.text rescue nil)
-      }
-      @io_threads = ((xml/'io/threads').first.text rescue nil)
-      @memory_guaranteed = ((xml/'memory_policy/guaranteed').first.text rescue nil)
-    end
-  end
-end

data/lib/ovirt/operating_system.rb

@@ -1,11 +0,0 @@
-module OVIRT
-  class OperatingSystem < BaseObject
-    attr_reader :description
-
-    def initialize(client, xml)
-      super(client, xml[:id], xml[:href], (xml/'name').text)
-      @description = (xml/'description').text
-      self
-    end
-  end
-end

data/lib/restclient_ext/request.rb

@@ -1,60 +0,0 @@
-# rest-client extension
-module RestClient
-  # This class enhance the rest-client request by accepting a parameter for ca certificate store,
-  # this file can be removed once https://github.com/rest-client/rest-client/pull/254
-  # get merged upstream.
-  #
-  # :ssl_cert_store - an x509 certificate store.
-  class Request
-
-    def transmit uri, req, payload, & block
-      setup_credentials req
-
-      net = net_http_class.new(uri.host, uri.port)
-      net.use_ssl = uri.is_a?(URI::HTTPS)
-      if (@verify_ssl == false) || (@verify_ssl == OpenSSL::SSL::VERIFY_NONE)
-        net.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      elsif @verify_ssl.is_a? Integer
-        net.verify_mode = @verify_ssl
-        net.verify_callback = lambda do |preverify_ok, ssl_context|
-          if (!preverify_ok) || ssl_context.error != 0
-            err_msg = "SSL Verification failed -- Preverify: #{preverify_ok}, Error: #{ssl_context.error_string} (#{ssl_context.error})"
-            raise SSLCertificateNotVerified.new(err_msg)
-          end
-          true
-        end
-      end
-      net.cert = @ssl_client_cert if @ssl_client_cert
-      net.key = @ssl_client_key if @ssl_client_key
-      net.ca_file = @ssl_ca_file if @ssl_ca_file
-      net.cert_store = args[:ssl_cert_store] if args[:ssl_cert_store]
-      net.read_timeout = @timeout if @timeout
-      net.open_timeout = @open_timeout if @open_timeout
-
-      # disable the timeout if the timeout value is -1
-      net.read_timeout = nil if @timeout == -1
-      net.out_timeout = nil if @open_timeout == -1
-
-      RestClient.before_execution_procs.each do |before_proc|
-        before_proc.call(req, args)
-      end
-
-      log_request
-
-      net.start do |http|
-        if @block_response
-          http.request(req, payload ? payload.to_s : nil, & @block_response)
-        else
-          res = http.request(req, payload ? payload.to_s : nil) { |http_response| fetch_body(http_response) }
-          log_response res
-          process_result res, & block
-        end
-      end
-    rescue EOFError
-      raise RestClient::ServerBrokeConnection
-    rescue Timeout::Error
-      raise RestClient::RequestTimeout
-    end
-
-  end
-end

data/spec/integration/instance_type_spec.rb

@@ -1,16 +0,0 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
-
-describe "Basic Instance type life cycle" do
-  before(:all) do
-    setup_client
-  end
-
-  it "test_should_return_instance_types" do
-    @client.instance_types
-  end
-
-  it "test_should_return_an_instance_type" do
-    @instance_type = @client.instance_types.first
-    @client.instance_type(@instance_type.id).id.should eql(@instance_type.id)
-  end
-end

data/spec/unit/volume_spec.rb

@@ -1,26 +0,0 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
-
-describe OVIRT::Volume 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">
-<name>disk1</name>
-<size>53687091200</size>
-<provisioned_size>53687091200</provisioned_size>
-<actual_size>143360</actual_size>
-<shareable>false</shareable>
-<propagate_errors>false</propagate_errors>
-<active>true</active>
-</disk>
-END_HEREDOC
-    vol =  OVIRT::Volume::new(nil, Nokogiri::XML(xml).xpath('/').first)
-
-    it "volume's bootable should be nil, since it was not specified" do
-      vol.bootable.should eql(nil)
-    end
-
-    it "volume's interface should be nil, since it was not specified" do
-      vol.interface.should eql(nil)
-    end
-
-end