ovirt 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4692aaa3e0f3118a4d794df4b468de40d22c9cc
-  data.tar.gz: 1a4443cbe30a58e4ff163bf43cad68d642a9ca15
+  metadata.gz: 06c3dc71f62f380fe6f34bd2a57ac7045cbc6501
+  data.tar.gz: 5fb4c4175f5c0729050355ee261b33d8ded8ca04
 SHA512:
-  metadata.gz: ebc8be1e7aa00ab6ad93f5bdfd196c12709fcdf2882a6645c8e3b0d360e8c9c5dcbda806e7e01d7e10325e3ac86954c3232ac4b70f3b7afe6067387afc634f3b
-  data.tar.gz: d89c8c9f6ea61b805ba7534fa1bbd1c25da11b069c87a780211c05e712ae9355cec71e94c2c565e34cdc87537e5aa7860fe998eccf4c512584fb8bba4babb3b7
+  metadata.gz: cfc2d50e1f7613163f7dfbf2d148f0f6fab804853d07eece7a28f13d4d6fe4f21a442faee757d0d5cc5bbe088b07dfc27f35e6191a2955cc0c388ac0f71cd9b5
+  data.tar.gz: 1a0b881e2fcf033a2e7b9d515c7cb7487672163093dbda275a0dbc5633af0025d322b6e37e07fef0b4d39113232200a542423d80f4752df65fe8d4dd23af3f61

data/lib/ovirt/api.rb

@@ -1,9 +1,6 @@
 module Ovirt
   class Api < Base
-
-    def self.parse_xml(xml)
-      node, hash                      = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :product_info, hash,
                        :node         => [:name, :vendor])
 
@@ -24,8 +21,6 @@ module Ovirt
 
       # There should not be any actions defined on the api
       hash.delete(:actions) if hash[:actions].empty?
-
-      hash
     end
   end
 end

data/lib/ovirt/base.rb

@@ -77,6 +77,10 @@ module Ovirt
       end
     end
 
+    def self.has_first_node?(node, path)
+      node.xpath(path.to_s).first.present?
+    end
+
     def self.top_level_objects=(keys)
       @top_level_objects = keys
     end
@@ -117,6 +121,11 @@ module Ovirt
       @top_level_timestamps ||= []
     end
 
+    def self.parse_xml(xml)
+      node, hash = xml_to_hash(xml)
+      parse_node_extended(node, hash) if respond_to?(:parse_node_extended)
+      hash
+    end
 
     def self.xml_to_hash(xml)
       node                          = xml_to_nokogiri(xml)
@@ -248,19 +257,14 @@ module Ovirt
 
     def method_missing(m, *args)
       if @relationships.has_key?(m)
-        rel_str        = m.to_s
-        rel_str        = 'storage_domains' if rel_str == 'storagedomains'
-        rel_str        = 'data_centers'    if rel_str == 'datacenters'
-        singular       = rel_str.singularize
-        klass          = Ovirt.const_get(singular.camelize)
-        xml            = @service.resource_get(@relationships[m])
-        doc            = Nokogiri::XML(xml)
-        return doc.root.xpath(singular).collect { |node| klass.create_from_xml(@service, node) }
+        relationship(m)
+      elsif @operations.has_key?(m)
+        operation(m, args)
+      elsif @attributes.has_key?(m)
+        @attributes[m]
+      else
+        super
       end
-
-      return operation(m, args) if @operations.has_key?(m)
-
-      super
     end
 
     def operation(method, *args)
@@ -276,6 +280,21 @@ module Ovirt
       end
     end
 
+    def relationship(rel)
+      if @relationships.has_key?(rel.to_sym)
+        rel_str  = rel.to_s
+        rel_str  = 'storage_domains' if rel_str == 'storagedomains'
+        rel_str  = 'data_centers'    if rel_str == 'datacenters'
+        singular = rel_str.singularize
+        klass    = Ovirt.const_get(singular.camelize)
+        xml      = @service.resource_get(@relationships[rel])
+        doc      = Nokogiri::XML(xml)
+        doc.root.xpath(singular).collect { |node| klass.create_from_xml(@service, node) }
+      else
+        raise "Relationship:<#{rel}> is not available for object <#{self.class.name}>"
+      end
+    end
+
     def destroy
       @service.resource_delete(@attributes[:href])
     end

data/lib/ovirt/cdrom.rb

@@ -1,12 +1,5 @@
 module Ovirt
   class Cdrom < Base
-
-    self.top_level_objects  = [:vm, :file]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
-      hash
-    end
+    self.top_level_objects = [:vm, :file]
   end
-end
+end

data/lib/ovirt/cluster.rb

@@ -1,12 +1,9 @@
 module Ovirt
   class Cluster < Base
+    self.top_level_strings = [:name, :description]
+    self.top_level_objects = [:data_center, :scheduling_policy]
 
-    self.top_level_strings  = [:name, :description]
-    self.top_level_objects  = [:data_center, :scheduling_policy]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :cpu,            hash, :attribute => [:id])
       parse_first_node(node, :version,        hash, :attribute_to_i => [:major, :minor])
       parse_first_node(node, :error_handling, hash, :node           => [:on_error])
@@ -16,8 +13,6 @@ module Ovirt
                                  :attribute_to_f => [:percent])
       parse_first_node_with_hash(node, 'memory_policy/transparent_hugepages', hash[:memory_policy][:transparent_hugepages] = {},
                                  :node_to_bool => [:enabled])
-
-      hash
     end
 
     def find_network_by_name(network_name)

data/lib/ovirt/data_center.rb

@@ -1,15 +1,12 @@
 module Ovirt
   class DataCenter < Base
-
-    self.top_level_strings  = [:name, :description, :storage_type, :storage_format]
+    self.top_level_strings = [:name, :description, :storage_type, :storage_format]
 
     def self.element_name
       "data_center"
     end
 
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :status,  hash, :node           => [:state])
       parse_first_node(node, :version, hash, :attribute_to_i => [:major, :minor])
 
@@ -17,8 +14,6 @@ module Ovirt
       supported_versions            = {}
       supported_versions[:versions] = supported_versions_node.xpath('version').collect { |version_node| { :major => version_node['major'].to_i, :minor => version_node['minor'].to_i } }
       hash[:supported_versions]     = supported_versions
-
-      hash
     end
   end
 end

data/lib/ovirt/disk.rb

@@ -1,14 +1,11 @@
 module Ovirt
   class Disk < Base
-
     self.top_level_strings  = [:name, :type, :interface, :format, :image_id]
     self.top_level_booleans = [:sparse, :bootable, :wipe_after_delete, :propagate_errors]
     self.top_level_integers = [:size, :provisioned_size, :actual_size]
     self.top_level_objects  = [:vm]
 
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :status, hash, :node => [:state])
       hash[:storage_domains] = node.xpath('storage_domains/storage_domain').collect { |n| hash_from_id_and_href(n) }
 
@@ -17,8 +14,6 @@ module Ovirt
           hash[:size] = size.text.to_i
         end
       end
-
-      hash
     end
 
     def attributes_for_new_disk

data/lib/ovirt/domain.rb

@@ -1,12 +1,5 @@
 module Ovirt
   class Domain < Base
-
-    self.top_level_strings  = [:name]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
-      hash
-    end
+    self.top_level_strings = [:name]
   end
 end

data/lib/ovirt/event.rb

@@ -1,15 +1,12 @@
 module Ovirt
   class Event < Base
-
     self.top_level_strings    = [:description, :severity]
     self.top_level_integers   = [:code]
     self.top_level_timestamps = [:time]
     self.top_level_objects    = [:cdrom, :cluster, :data_center, :disk, :domain, :file, :group, :host, :host_nic, :network, :nic, :permission, :permit, :role, :snapshot, :storage, :storage_domain, :tag, :template, :user, :vm, :vmpool]
 
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
+    def self.parse_node_extended(_node, hash)
       set_event_name(hash)
-      hash
     end
 
     def self.set_event_name(hash)
@@ -489,4 +486,4 @@ module Ovirt
       9501 => "TASK_CLEARING_ASYNC_TASK",
     }
   end
-end
+end

data/lib/ovirt/file.rb

@@ -1,13 +1,6 @@
 module Ovirt
   class File < Base
-
-    self.top_level_strings    = [:name]
-    self.top_level_objects    = [:storage_domain]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
-      hash
-    end
+    self.top_level_strings = [:name]
+    self.top_level_objects = [:storage_domain]
   end
 end

data/lib/ovirt/group.rb

@@ -1,12 +1,5 @@
 module Ovirt
   class Group < Base
-
     self.top_level_strings = [:name]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
-      hash
-    end
   end
 end

data/lib/ovirt/host.rb

@@ -1,19 +1,25 @@
 module Ovirt
   class Host < Base
+    self.top_level_strings  = [:name, :type, :address]
+    self.top_level_integers = [:port, :memory, :max_scheduling_memory]
+    self.top_level_booleans = [:storage_manager]
+    self.top_level_objects  = [:cluster]
 
-    self.top_level_strings    = [:name, :type, :address]
-    self.top_level_integers   = [:port]
-    self.top_level_booleans   = [:storage_manager]
-    self.top_level_objects    = [:cluster]
-
-    def self.parse_xml(xml)
-      node, hash                      = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       hash[:relationships][:host_nics] = hash[:relationships].delete(:nics)
 
+      parse_first_node(node, :certificate, hash,
+                       :node => [:organization, :subject])
+
       parse_first_node(node, :status, hash,
                        :node => [:state])
 
+      parse_first_node(node, :version, hash,
+                       :attribute => [:major, :minor, :build, :revision, :full_version])
+
+      parse_first_node(node, :hardware_information, hash,
+                       :node => [:manufacturer, :version, :serial_number, :product_name, :uuid, :family])
+
       parse_first_node(node, :power_management, hash,
                        :attribute    => [:type],
                        :node         => [:address, :username, :options],
@@ -28,17 +34,31 @@ module Ovirt
       parse_first_node(node, :iscsi, hash,
                        :node => [:initiator])
 
+      parse_first_node(node, :ssh, hash,
+                       :node => [:port, :fingerprint])
+
       parse_first_node(node, :cpu, hash,
                        :node      => [:name],
                        :node_to_i => [:speed])
 
-      parse_first_node_with_hash(node, 'cpu/topology', hash.store_path(:cpu, :topology, {}),
-                       :attribute_to_i => [:sockets, :cores])
+      if has_first_node?(node, 'cpu/topology')
+        parse_first_node_with_hash(node, 'cpu/topology', hash.store_path(:cpu, :topology, {}),
+                                   :attribute_to_i => [:sockets, :cores])
+      end
 
       parse_first_node(node, :summary, hash,
                        :node_to_i => [:active, :migrating, :total])
 
-      hash
+      parse_first_node(node, :os, hash,
+                       :attribute => [:type])
+
+      if has_first_node?(node, 'os/version')
+        parse_first_node_with_hash(node, 'os/version', hash.store_path(:os, :version, {}),
+                                   :attribute => [:full_version])
+      end
+
+      parse_first_node(node, :libvirt_version, hash,
+                       :attribute => [:major, :minor, :build, :revision, :full_version])
     end
   end
 end

data/lib/ovirt/host_nic.rb

@@ -1,6 +1,5 @@
 module Ovirt
   class HostNic < Base
-
     self.top_level_strings  = [:name, :boot_protocol]
     self.top_level_integers = [:speed]
     self.top_level_objects  = [:host, :network]
@@ -9,9 +8,7 @@ module Ovirt
       "host_nic"
     end
 
-    def self.parse_xml(xml)
-      node, hash     = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :status,  hash, :node      => [:state])
       parse_first_node(node, :mac,     hash, :attribute => [:address])
       parse_first_node(node, :ip,      hash, :attribute => [:address, :netmask, :gateway])
@@ -31,8 +28,6 @@ module Ovirt
           hash[:bonding][:slaves][:host_nics] << {:id => slave[:id], :href => slave[:href]}
         end
       end
-
-      hash
     end
   end
 end

data/lib/ovirt/network.rb

@@ -1,16 +1,11 @@
 module Ovirt
   class Network < Base
-
     self.top_level_strings  = [:name, :description]
     self.top_level_booleans = [:stp, :display]
     self.top_level_objects  = [:data_center, :cluster, :vlan]
 
-    def self.parse_xml(xml)
-      node, hash    = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :status, hash, :node => [:state])
-
-      hash
     end
   end
 end

data/lib/ovirt/nic.rb

@@ -1,16 +1,11 @@
 module Ovirt
   class Nic < Base
+    self.top_level_strings = [:name, :interface]
+    self.top_level_objects = [:vm, :network]
 
-    self.top_level_strings  = [:name, :interface]
-    self.top_level_objects  = [:vm, :network]
-
-    def self.parse_xml(xml)
-      node, hash     = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :network, hash, :node      => [:name])
       parse_first_node(node, :mac,     hash, :attribute => [:address])
-
-      hash
     end
 
     def attributes_for_new_nic

data/lib/ovirt/permission.rb

@@ -1,11 +1,8 @@
 module Ovirt
   class Permission < Base
+    self.top_level_objects = [:role, :user]
 
-    self.top_level_objects  = [:role, :user]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       [:template].each do |type|
         subject_node = node.xpath(type.to_s).first
         next if subject_node.nil?
@@ -13,8 +10,6 @@ module Ovirt
         subject[:type] = type
         hash[:subject] = subject
       end
-
-      hash
     end
   end
 end

data/lib/ovirt/permit.rb

@@ -1,14 +1,7 @@
 module Ovirt
   class Permit < Base
-
     self.top_level_strings  = [:name]
     self.top_level_booleans = [:administrative]
     self.top_level_objects  = [:role]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
-      hash
-    end
   end
 end

data/lib/ovirt/role.rb

@@ -1,13 +1,6 @@
 module Ovirt
   class Role < Base
-
     self.top_level_strings  = [:name, :description]
     self.top_level_booleans = [:administrative, :mutable]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
-      hash
-    end
   end
 end

data/lib/ovirt/service.rb

@@ -135,6 +135,18 @@ module Ovirt
       uri
     end
 
+    def self.ovirt?(options)
+      options[:username] = options[:password] = "_unused"
+      !self.new(options).engine_ssh_public_key.to_s.blank?
+    rescue RestClient::ResourceNotFound
+      false
+    end
+
+    def engine_ssh_public_key
+      require "rest-client"
+      RestClient::Resource.new("#{base_uri}/engine.ssh.key.txt", resource_options).get
+    end
+
     def paginate_resource_get(path = nil, sort_by=:name, direction=:asc)
       log_header = "#{self.class.name}#paginate_resource_get"
       page = 1

data/lib/ovirt/snapshot.rb

@@ -1,16 +1,9 @@
 module Ovirt
   class Snapshot < Base
-
     self.top_level_strings    = [:description, :snapshot_status, :type]
     self.top_level_timestamps = [:date]
     self.top_level_objects    = [:vm]
 
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
-      hash
-    end
-
     def initialize(service, options = {})
       super
       @relationships[:disks] = self[:href] + "/disks"

data/lib/ovirt/statistic.rb

@@ -1,11 +1,8 @@
 module Ovirt
   class Statistic < Base
+    self.top_level_strings = [:name, :description, :type, :unit]
 
-    self.top_level_strings    = [:name, :description, :type, :unit]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       values               = []
       values_node          = node.xpath('values').first
       values_type          = values_node['type']
@@ -30,8 +27,6 @@ module Ovirt
         parent[:type] = type
         hash[:parent] = parent
       end
-
-      hash
     end
   end
 end

data/lib/ovirt/storage.rb

@@ -1,14 +1,9 @@
 module Ovirt
   class Storage < Base
+    self.top_level_objects = [:host]
 
-    self.top_level_objects  = [:host]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :volume_group, hash, :attribute => [:id])
-
-      hash
     end
   end
 end

data/lib/ovirt/storage_domain.rb

@@ -1,18 +1,15 @@
 module Ovirt
   class StorageDomain < Base
-
-    self.top_level_strings    = [:name, :type, :storage_format]
-    self.top_level_booleans   = [:master]
-    self.top_level_integers   = [:available, :used, :committed]
-    self.top_level_objects    = [:data_center]
+    self.top_level_strings  = [:name, :type, :storage_format]
+    self.top_level_booleans = [:master]
+    self.top_level_integers = [:available, :used, :committed]
+    self.top_level_objects  = [:data_center]
 
     def self.element_name
       "storage_domain"
     end
 
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :status,  hash, :node => [:state])
       parse_first_node(node, :storage, hash, :node => [:type, :address, :path])
       parse_first_node(node, :storage, hash, :attribute => [:id])
@@ -32,8 +29,6 @@ module Ovirt
           end
         end
       end
-
-      hash
     end
 
     def self.iso_storage_domain(service)

data/lib/ovirt/tag.rb

@@ -1,12 +1,9 @@
 module Ovirt
   class Tag < Base
-
     self.top_level_strings = [:name, :description]
     self.top_level_objects = [:host, :user, :vm]
 
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parent_node = node.xpath('parent').first
       unless parent_node.nil?
         tag_node = parent_node.xpath('tag').first
@@ -16,8 +13,6 @@ module Ovirt
           hash[:parent] = parent
         end
       end
-
-      hash
     end
   end
 end

data/lib/ovirt/template.rb

@@ -1,20 +1,17 @@
 module Ovirt
   class Template < Base
-
     self.top_level_strings    = [:name, :description, :type]
     self.top_level_booleans   = [:stateless]
     self.top_level_integers   = [:memory]
     self.top_level_timestamps = [:creation_time]
     self.top_level_objects    = [:cluster]
 
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
+    def self.parse_node_extended(node, hash)
       parse_first_node(node, :status, hash, :node => [:state])
 
       parse_first_node(node, :display, hash,
                        :node      => [:type, :address],
-                       :node_to_i => [:port, :monitors])
+                       :node_to_i => [:port, :monitors, :secure_port])
 
       parse_first_node(node, :usb, hash,
                        :node_to_bool => [:enabled])
@@ -41,9 +38,6 @@ module Ovirt
       node.xpath('custom_properties/custom_property').each do |ca|
         hash[:custom_attributes] << {:name => ca[:name], :value => ca[:value]}
       end
-
-
-      hash
     end
 
     def os_type

data/lib/ovirt/user.rb

@@ -1,15 +1,11 @@
 module Ovirt
   class User < Base
-
     self.top_level_strings  = [:name, :description, :domain, :user_name]
     self.top_level_booleans = [:logged_in]
 
-    def self.parse_xml(xml)
-      node, hash    = xml_to_hash(xml)
+    def self.parse_node_extended(node, hash)
       groups_node   = node.xpath('groups').first
       hash[:groups] = groups_node.xpath('group').collect { |group_node| group_node.text } unless groups_node.nil?
-
-      hash
     end
   end
 end

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/ovirt/vm.rb

@@ -1,6 +1,5 @@
 module Ovirt
   class Vm < Template
-
     self.top_level_strings    = [:name, :origin, :type, :description]
     self.top_level_booleans   = [:stateless]
     self.top_level_integers   = [:memory]

data/lib/ovirt/vmpool.rb

@@ -1,14 +1,7 @@
 module Ovirt
   class Vmpool < Base
-
-    self.top_level_strings    = [:name, :description]
-    self.top_level_integers   = [:size]
-    self.top_level_objects    = [:cluster, :template]
-
-    def self.parse_xml(xml)
-      node, hash = xml_to_hash(xml)
-
-      hash
-    end
+    self.top_level_strings  = [:name, :description]
+    self.top_level_integers = [:size]
+    self.top_level_objects  = [:cluster, :template]
   end
 end

data/spec/service_spec.rb

@@ -28,6 +28,25 @@ EOX
     end
   end
 
+  context ".ovirt?" do
+    it "false when ResourceNotFound" do
+      described_class.any_instance.should_receive(:engine_ssh_public_key).and_raise(RestClient::ResourceNotFound)
+      described_class.ovirt?(:server => "127.0.0.1").should be false
+    end
+
+    it "true when key non-empty" do
+      fake_key = "ssh-rsa " + ("A" * 372) + " ovirt-engine\n"
+      described_class.any_instance.should_receive(:engine_ssh_public_key).and_return(fake_key)
+      described_class.ovirt?(:server => "127.0.0.1").should be true
+    end
+
+    it "false when key empty" do
+      fake_key = "\n"
+      described_class.any_instance.should_receive(:engine_ssh_public_key).and_return(fake_key)
+      described_class.ovirt?(:server => "127.0.0.1").should be false
+    end
+  end
+
   context "#base_uri" do
     let(:defaults) { {:username => nil, :password => nil}}
     subject { described_class.new(defaults.merge(@options)).send(:base_uri) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Frey
@@ -9,10 +9,11 @@ authors:
 - Keenan Brock
 - Joe Rafaniello
 - Greg Blomquist
+- Martin Povolny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,14 +131,14 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.2
 description: Ovirt provides a simple Object Oriented interface to the REST API of
@@ -148,6 +149,7 @@ email:
 - keenan@thebrocks.net
 - jrafanie@redhat.com
 - gblomqui@redhat.com
+- mpovolny@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []