ovirt 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f613c2d824b0dbb9ba03acef085787bb0a173c35
-  data.tar.gz: d3678ad7665af01b60c8b2c9bdb2e1a1c013db76
+  metadata.gz: c82f2d658955528e5e35c3c3eceafa20d0757168
+  data.tar.gz: 73b2a0d08d55af23d29d8cda5efc7d2a942b78ef
 SHA512:
-  metadata.gz: c9acc652791095ccdaf69511f4fb51fc0b2b5a8c009ef2d68cf949c94a8848f29249f79e125f89f70811c78db247fdad41c3d4ea37412d9531f817465cdb7978
-  data.tar.gz: 3ad7fb06019661a9899bdf3dbc058b4fc2140c4c76ecc67be09c6c1ab0253a1b7ed6b5edea07fcd008bb6be779ed5250be5c270b6a4586280523574aa65787d5
+  metadata.gz: 64f341695af226e85a2ed87d237e5481ace077c554f2180219665b523d27ed2148d21dfda1182189bb476c3f353f3f71a48a6063a361290af3852ed5e97db025
+  data.tar.gz: 7e181ac7fbdd65a6a0a123d4dabb41d55733df29b6d0850a8b3577a3e0eb04ee24e5f134e88f2d28b3b7ac8c6284698390b221f9e516e838b72fe253edb6b813

data/lib/ovirt/host.rb

@@ -54,7 +54,7 @@ module Ovirt
 
       if has_first_node?(node, 'os/version')
         parse_first_node_with_hash(node, 'os/version', hash.store_path(:os, :version, {}),
-                                   :attribute => [:full_version])
+                                   :attribute => [:full_version, :major, :minor, :build])
       end
 
       parse_first_node(node, :libvirt_version, hash,

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.12.1"
+  VERSION = "0.13.0"
 end

data/lib/ovirt.rb

@@ -17,7 +17,6 @@ require 'ovirt/file'
 require 'ovirt/group'
 require 'ovirt/host'
 require 'ovirt/host_nic'
-require 'ovirt/inventory'
 require 'ovirt/network'
 require 'ovirt/nic'
 require 'ovirt/permission'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Jason Frey
@@ -21,10 +21,11 @@ authors:
 - Martin Betak
 - Tomas Jelinek
 - Piotr Kliczewski
+- Moti Asayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -138,20 +139,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  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
@@ -186,6 +173,7 @@ email:
 - mbetak@redhat.com
 - tjelinek@redhat.com
 - piotr.kliczewski@gmail.com
+- masayag@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -207,7 +195,6 @@ files:
 - lib/ovirt/group.rb
 - lib/ovirt/host.rb
 - lib/ovirt/host_nic.rb
-- lib/ovirt/inventory.rb
 - lib/ovirt/legacy_support/cloud_init_via_floppy_payload.rb
 - lib/ovirt/logging.rb
 - lib/ovirt/network.rb

data/lib/ovirt/inventory.rb

@@ -1,207 +0,0 @@
-module Ovirt
-  class Inventory
-    attr_accessor :service
-
-    def initialize(options = {})
-      @service = Service.new(options)
-    end
-
-    def api
-      standard_collection('api').first
-    end
-
-    def capabilities
-      standard_collection("capabilities")
-    end
-
-    def clusters
-      standard_collection("clusters")
-    end
-
-    def datacenters
-      standard_collection("datacenters", "data_center")
-    end
-
-    def domains
-      standard_collection("domains")
-    end
-
-    def events(options = {})
-      if options[:since]
-        standard_collection("events?from=#{options[:since]}", "event")
-      elsif options[:max]
-        standard_collection("events;max=#{options[:max]}", "event", false, "time", :desc)
-      else
-        standard_collection("events")
-      end
-    end
-
-    def groups
-      standard_collection("groups")
-    end
-
-    def hosts
-      standard_collection("hosts", nil, true)
-    end
-
-    def networks
-      standard_collection("networks")
-    end
-
-    def roles
-      standard_collection("roles")
-    end
-
-    def storagedomains
-      standard_collection("storagedomains", "storage_domain", true)
-    end
-
-    def tags
-      standard_collection("tags")
-    end
-
-    def templates
-      standard_collection("templates")
-    end
-
-    def users
-      standard_collection("users")
-    end
-
-    def vms
-      standard_collection("vms", nil, true)
-    end
-
-    def vmpools
-      standard_collection("vmpools")
-    end
-
-    def get_vm(path)
-      vm_guid = ::File.basename(path, '.*')
-      vm      = get_resource_by_ems_ref("/api/vms/#{vm_guid}") rescue nil
-      vm      = get_resource_by_ems_ref("/api/templates/#{vm_guid}") if vm.blank?
-      vm
-    end
-
-    def get_resource_by_ems_ref(uri_suffix, element_name = nil)
-      @service.get_resource_by_ems_ref(uri_suffix, element_name)
-    end
-
-    def get_resources_by_uri_path(uri_suffix, element_name = nil)
-      @service.get_resources_by_uri_path(uri_suffix, element_name)
-    end
-
-    def refresh
-      # TODO: Change to not return native objects to the caller.  The caller
-      #       should just expect raw data.
-      primary_items = collect_primary_jobs(primary_item_jobs)
-      collect_secondary_items(primary_items, SECONDARY_ITEMS)
-    end
-
-    def targeted_refresh(methods)
-      primary_items = collect_primary_targeted_jobs(methods[:primary].to_a)
-      collect_secondary_items(primary_items, methods[:secondary])
-    end
-
-    def api_path
-      @service.api_path
-    end
-
-    private
-
-    def standard_collection(uri_suffix, element_name = nil, paginate = false, sort_by = :name, direction = :asc)
-      @service.standard_collection(uri_suffix, element_name, paginate, sort_by, direction)
-    end
-
-    # TODO: Remove this key/method translation and just use the method name as
-    #       the key directly.
-    PRIMARY_ITEMS = {
-      # Key          RHEVM API method
-      :cluster    => :clusters,
-      :vmpool     => :vmpools,
-      :network    => :networks,
-      :storage    => :storagedomains,
-      :datacenter => :datacenters,
-      :host       => :hosts,
-      :vm         => :vms,
-      :template   => :templates
-    }
-
-    SECONDARY_ITEMS = {
-      # Key          RHEVM API methods
-      :datacenter => [:storagedomains],
-      :host       => [:statistics, :host_nics], # :cdroms, tags
-      :vm         => [:disks, :snapshots, :nics],
-      :template   => [:disks]
-    }
-
-    def primary_item_jobs
-      PRIMARY_ITEMS.to_a
-    end
-
-    # Returns all combinations of primary resources and the methods to run on those resources.
-    #
-    # > secondary_item_jobs({:vm, => [v1, v2]})
-    #  => [[v1, :disks], [v1, :snapshots], [v1, :nics], [v2, :disks], [v2, :snapshots], [v2, :nics]]
-    def secondary_item_jobs(primary_items, secondary_items)
-      secondary_items.flat_map do |key, methods|
-        primary_items[key].product(methods)
-      end
-    end
-
-    def collect_primary_jobs(jobs)
-      results = collect_in_parallel(jobs) do |_, method|
-        send(method)
-      end
-
-      jobs.zip(results).each_with_object({}) do |((key, _), result), hash|
-        hash[key] = result
-      end
-    end
-
-    def collect_primary_targeted_jobs(jobs)
-      results = collect_in_parallel(jobs) do |key, ems_ref|
-        if ems_ref.kind_of?(Array)
-          ems_ref.flat_map { |item| get_resources_by_uri_path(item) rescue Array.new }
-        elsif ems_ref.kind_of?(Hash)
-          collection, element_name = ems_ref.first
-          standard_collection(collection, element_name, true)
-        else
-          get_resources_by_uri_path(ems_ref) rescue Array.new
-        end
-      end
-
-      jobs.zip(results).each_with_object({}) do |((key, _), result), hash|
-        hash[key] = result
-      end
-    end
-
-    def collect_secondary_items(primary_items, secondary_items)
-      jobs = secondary_item_jobs(primary_items, secondary_items)
-
-      results = collect_in_parallel(jobs) do |resource, method|
-        resource.send(method) rescue nil
-      end
-
-      jobs.zip(results).each do |(resource, method), result|
-        resource.attributes[method] = result
-      end
-
-      primary_items
-    end
-
-    def collect_in_parallel(jobs, &block)
-      require 'parallel'
-      Parallel.map(jobs, :in_threads => num_threads, &block)
-    end
-
-    def num_threads
-      use_threads? ? 8 : 0
-    end
-
-    # HACK: VCR is not threadsafe, and so tests running under VCR fail
-    def use_threads?
-      !defined?(VCR)
-    end
-  end
-end