rbovirt 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abcc1f63781e5ac6ab29e40b1f497e5ae0fc35a7
-  data.tar.gz: fb5b226fe6dcd08f3ed0c7aad7449ed19805127c
+  metadata.gz: 24d9c850c785261ddcce09c73bece4e49287674f
+  data.tar.gz: 01d0e257a952c22855e2a039caefbd1e930808e7
 SHA512:
-  metadata.gz: 4a0bdc00d5b70be58f5daca0a9e67eb9b646f34b127c5514d4a84468a51aa44cff3417f8d89890d44dff3154c4f472ee98895e7a7478dedc1334707a92dda813
-  data.tar.gz: af49d5221bf07f53d22569ea6db69c8370113321c1bb308aa4bd252c7509d7cf37cc5fbf1d00a3f9975db1dbb80132e8c180c5367b658ad632517cded9a82ad5
+  metadata.gz: ef5da7148b56d0a56a76757317829643dde5601742a5a16665c343ec0f24f0af64025187f206cfb743bc207727e452fae313f994ecffab931bf1f1c1cc56a49d
+  data.tar.gz: d144a471b8008dca6aa0700343e07815f7d838077653acb2dc54d5dc57a9350bed4a3120854678c92a64235d81f46139c8e49bfef02c270b34cda63fd53aff9e

data/lib/client/instance_type_api.rb

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,10 @@
+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/client/vm_api.rb

@@ -6,7 +6,11 @@ module OVIRT
     end
 
     def vms(opts={})
-      headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
+      if opts[:without_details]
+        headers = {:accept => "application/xml"}
+      else
+        headers = {:accept => "application/xml; detail=disks; detail=nics; detail=hosts"}
+      end
       path = "/vms"
       path += search_url(opts) unless filtered_api
       http_get(path, headers).xpath('/vms/vm').collect do |vm|

data/lib/ovirt/instance_type.rb

@@ -0,0 +1,73 @@
+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

@@ -0,0 +1,11 @@
+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/ovirt/template.rb

@@ -36,8 +36,8 @@ module OVIRT
       @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
+        :type => ((xml/'display/type').first.text rescue ''),
+        :monitors => ((xml/'display/monitors').first.text rescue 0)
       }
       @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/version.rb

@@ -1,3 +1,3 @@
 module OVIRT
-  VERSION = "0.0.35"
+  VERSION = "0.0.36"
 end

data/lib/ovirt/vm.rb

@@ -76,18 +76,23 @@ module OVIRT
           end
           # os element must not be sent when template is present (RHBZ 1104235)
           if opts[:template].nil? || opts[:template].empty?
-            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')
+            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
               end
-              kernel (opts[:os_kernel])
-              initrd (opts[:os_initrd])
-              cmdline (opts[:os_cmdline])
-            }
+            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
           end
           display_{
             type_(opts[:display][:type])
@@ -237,12 +242,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,
+        :type => ((xml/'display/type').first.text rescue ''),
         :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
+        :monitors => ((xml/'display/monitors').first.text rescue 0)
       }
       @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/rbovirt.rb

@@ -11,7 +11,9 @@ 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"
@@ -22,6 +24,8 @@ 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 "nokogiri"
 require "rest_client"
@@ -44,7 +48,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
+    attr_reader :credentials, :api_entrypoint, :datacenter_id, :cluster_id, :filtered_api, :ca_cert_file, :ca_cert_store, :ca_no_verify, :persistent_auth, :jsessionid
 
     # Construct a new ovirt client class.
     # mandatory parameters
@@ -66,14 +70,16 @@ 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]
+      @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]
     end
 
     def api_version
@@ -92,9 +98,13 @@ module OVIRT
     end
 
     private
+
     def search_url opts
-      search = opts[:search] || ("datacenter=%s" % current_datacenter.name)
-      "?search=%s" % CGI.escape(search)
+      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)}"
     end
 
     def current_datacenter
@@ -107,9 +117,7 @@ module OVIRT
 
     def http_get(suburl, headers={})
       begin
-        res = rest_client(suburl).get(http_headers(headers))
-        puts "#{res}\n" if ENV['RBOVIRT_LOG_RESPONSE']
-        Nokogiri::XML(res)
+        handle_success(rest_client(suburl).get(http_headers(headers)))
       rescue
         handle_fault $!
       end
@@ -117,9 +125,7 @@ module OVIRT
 
     def http_post(suburl, body, headers={})
       begin
-        res = rest_client(suburl).post(body, http_headers(headers))
-        puts "#{res}\n" if ENV['RBOVIRT_LOG_RESPONSE']
-        Nokogiri::XML(res)
+        handle_success(rest_client(suburl).post(body, http_headers(headers)))
       rescue
         handle_fault $!
       end
@@ -127,9 +133,7 @@ module OVIRT
 
     def http_put(suburl, body, headers={})
       begin
-        res = rest_client(suburl).put(body, http_headers(headers))
-        puts "#{res}\n" if ENV['RBOVIRT_LOG_RESPONSE']
-        Nokogiri::XML(res)
+        handle_success(rest_client(suburl).put(body, http_headers(headers)))
       rescue
         handle_fault $!
       end
@@ -139,9 +143,7 @@ module OVIRT
       begin
         headers = body ? http_headers(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)
+        handle_success(rest_client(suburl).delete_with_payload(body, headers))
       rescue
         handle_fault $!
       end
@@ -150,7 +152,12 @@ module OVIRT
     def auth_header
       # This is the method for strict_encode64:
       encoded_credentials = ["#{@credentials[:username]}:#{@credentials[:password]}"].pack("m0").gsub(/\n/,'')
-      { :authorization => "Basic " + encoded_credentials }
+      headers = { :authorization => "Basic " + encoded_credentials }
+      if persistent_auth
+        headers[:prefer] = 'persistent-auth'
+        headers[:cookie] = "JSESSIONID=#{jsessionid}" if jsessionid
+      end
+      headers
     end
 
     def rest_client(suburl)
@@ -188,6 +195,12 @@ module OVIRT
       }).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/spec/integration/api_spec.rb

@@ -58,6 +58,28 @@ 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/instance_type_spec.rb

@@ -0,0 +1,16 @@
+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/integration/vm_crud_spec.rb

@@ -42,6 +42,8 @@ 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)
@@ -51,6 +53,8 @@ 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.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -80,8 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      A Ruby client for oVirt REST API
+description: "    A Ruby client for oVirt REST API\n"
 email:
 - abenari@redhat.com
 executables: []
@@ -102,6 +101,8 @@ files:
 - lib/client/datacenter_api.rb
 - lib/client/disk_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,8 +112,10 @@ files:
 - lib/ovirt/cluster.rb
 - lib/ovirt/datacenter.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
@@ -126,6 +129,7 @@ files:
 - 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
@@ -156,14 +160,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 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
+has_rdoc: