ovirt 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592fb6a64d52fa897faad834c4c5874bea89ac63
-  data.tar.gz: 3b38a6108e3fa79e073929bc461fab31961c0c4e
+  metadata.gz: f0f4293560478cd39aa761c4aaec2b68b4b48fb6
+  data.tar.gz: ae54f822fcb29c456eb8216b99e49e829eb666b0
 SHA512:
-  metadata.gz: bfa70c2fffa484403532a59f74184727bd65ca46e0976034f049383ca16d59f59403adaebe7a03a544e4d55b0dee5012876d8deb9014f7433e55f64a43a3e5de
-  data.tar.gz: ea20ead44f3d4cf96bbc3b667d5d257a31745b32b6651e51377818e98fa3a67ffe56f347f99c0c4ffe41d485ffe1ce7a1e9fdfe169b00eb7149fd08e3acb51cf
+  metadata.gz: b820d2f7680c71664d9f4a066701ec9380c1527903ca747fc98b4e35f1362e3bcb2d19bed15fe58c523009e787e22a5e2526fe63a97e50ea82d16888a6d4e7c6
+  data.tar.gz: 86fc253644730f32b29bba7b83b8738af5cfac1ec1b7d1389212036467411c17a66007308be2d4f7b2c1c9164951ae4ed8f8b16d74645de889cb68d9585fcbbe

data/lib/ovirt/base.rb

@@ -165,12 +165,9 @@ module Ovirt
     end
 
     def self.xml_to_nokogiri(xml)
-      if xml.kind_of?(Nokogiri::XML::Element)
-        nokogiri = xml
-      else
-        nokogiri = Nokogiri::XML(xml).root
-      end
-      nokogiri
+      return xml if xml.kind_of?(Nokogiri::XML::Element)
+
+      Nokogiri::XML(xml).root
     end
 
     def self.href_from_creation_status_link(link)

data/lib/ovirt/exception.rb

@@ -3,6 +3,7 @@ module Ovirt
   class Error < StandardError; end
 
   # Existence
+  class MissingResourceError < Error; end
   class TemplateAlreadyExists < Error; end
   class VmAlreadyExists < Error; end
 

data/lib/ovirt/inventory.rb

@@ -90,8 +90,13 @@ module Ovirt
     def refresh
       # TODO: Change to not return native objects to the caller.  The caller
       #       should just expect raw data.
-      primary_items = collect_primary_items
-      collect_secondary_items(primary_items)
+      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
 
     private
@@ -130,15 +135,13 @@ module Ovirt
     #
     # > 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.flat_map do |key, methods|
+    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_items
-      jobs = primary_item_jobs
-
+    def collect_primary_jobs(jobs)
       results = collect_in_parallel(jobs) do |_, method|
         send(method)
       end
@@ -148,8 +151,18 @@ module Ovirt
       end
     end
 
-    def collect_secondary_items(primary_items)
-      jobs = secondary_item_jobs(primary_items)
+    def collect_primary_targeted_jobs(jobs)
+      results = collect_in_parallel(jobs) do |key, ems_ref|
+        get_resource_by_ems_ref(ems_ref, key.to_s)
+      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

data/lib/ovirt/service.rb

@@ -68,6 +68,24 @@ module Ovirt
       api(true)[:summary] # This is volatile information
     end
 
+    def ca_certificate
+      @ca_certificate ||= verify_certificate(get_ca_certificate)
+    end
+
+    def verify_certificate(certificate)
+      return if certificate.to_s.strip.empty?
+
+      require 'openssl'
+      OpenSSL::X509::Certificate.new(certificate).to_s
+    rescue OpenSSL::X509::CertificateError
+    end
+
+    def get_ca_certificate
+      require "rest-client"
+      RestClient::Resource.new("#{base_uri}/ca.crt", resource_options).get
+    rescue RestClient::ResourceNotFound
+    end
+
     def special_objects
       @special_objects ||= api[:special_objects]
     end
@@ -102,7 +120,8 @@ module Ovirt
       doc            = Nokogiri::XML(xml)
       element_name ||= doc.root.name
       klass          = self.class.name_to_class(element_name)
-      xml_to_object(klass, doc.root)
+      objects        = doc.xpath("//#{element_name}")
+      objects.collect { |obj| xml_to_object(klass, obj) }
     end
 
     def standard_collection(uri_suffix, element_name = nil, paginate = false, sort_by = :name, direction = :asc)
@@ -202,8 +221,8 @@ module Ovirt
         case response.code
         when 200..206
           parse_normal_response(response, resource)
-        when 400, 409
-          parse_error_response(response)
+        when 400..409
+          parse_error_response(response, resource)
         else
           response.return!(request, result, &block)
         end
@@ -230,7 +249,9 @@ module Ovirt
       response
     end
 
-    def parse_error_response(response)
+    def parse_error_response(response, resource)
+      logger.error "#{self.class.name}#parse_error_response Return from URL: <#{resource.url}> Data:#{response}"
+      raise Ovirt::MissingResourceError if response.code == 404
       doc    = Nokogiri::XML(response)
       action = doc.xpath("action").first
       node   = action || doc

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/spec/factories/service.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :service, :class => "Ovirt::Service" do
-    initialize_with { new(:server => "", :username => "", :password => "") }
+    server ""
+    initialize_with { new(:server => server, :username => "", :password => "") }
   end
 end

data/spec/service_spec.rb

@@ -43,11 +43,110 @@ EOX
     end
   end
 
+  describe "#ca_certificate" do
+    let(:letsencrypt_org_certificate) do
+<<-EOC
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBK
+MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVu
+VHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQw
+MTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScw
+JQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ldhNlT
+3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU
++ehcCuz/mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gp
+S0l4PJNgiCL8mdo2yMKi1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1
+bVoE/c40yiTcdCMbXTMTEl3EASX2MN0CXZ/g1Ue9tOsbobtJSdifWwLziuQkkORi
+T0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl3ZBWzvurpWCdxJ35UrCL
+vYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzyNeVJSQjK
+Vsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZK
+dHzVWYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHT
+c+XvvqDtMwt0viAgxGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hv
+l7yTmvmcEpB4eoCHFddydJxVdHixuuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5N
+iGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZIhvcNAQELBQAD
+ggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwt
+LRvM7Kqas6pgghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93
+nAbowacYXVKV7cndJZ5t+qntozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3
++wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmVYjzlVYA211QC//G5Xc7UI2/YRYRK
+W2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUXfeu+h1sXIFRRk0pT
+AwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/rokTLq
+l1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG
+4iZZRHUe2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZ
+mUlO+KWA2yUPHGNiiskzZ2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A
+7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7RcGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+EOC
+    end
+    let(:rest_client_resource_double) { double("RestClient::Resource") }
+    let(:service)                     { build(:service, :server => "test.example.com") }
+
+    before { allow(RestClient::Resource).to receive(:new).and_return(rest_client_resource_double) }
+
+    it 'with a valid certificate' do
+      expect(rest_client_resource_double).to receive(:get).once.and_return(letsencrypt_org_certificate)
+
+      2.times { expect(service.ca_certificate).to eq(letsencrypt_org_certificate) }
+    end
+
+    it "with invalid certificate" do
+      expect(rest_client_resource_double).to receive(:get).and_return("ABCDEFG", "  ", nil)
+
+      3.times { expect(service.ca_certificate).to eq(nil) }
+    end
+
+    it "server doesn't respond" do
+      expect(rest_client_resource_double).to receive(:get).and_raise(RestClient::ResourceNotFound)
+
+      expect(service.ca_certificate).to eq(nil)
+    end
+  end
+
   it "#resource_get on exception" do
     allow(service).to receive(:create_resource).and_raise(Exception, "BLAH")
     expect { service.resource_get('api') }.to raise_error(Exception, "BLAH")
   end
 
+  context "#get_resource_by_ems_ref" do
+    it "fetches data_center" do
+      return_message = <<-EOX.chomp
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<data_center href="/api/datacenters/00000001-0001-0001-0001-0000000000f1" id="00000001-0001-0001-0001-0000000000f1">
+    <name>Default</name>
+    <description>The default Data Center</description>
+    <link href="/api/datacenters/00000001-0001-0001-0001-0000000000f1/storagedomains" rel="storagedomains"/>
+    <link href="/api/datacenters/00000001-0001-0001-0001-0000000000f1/clusters" rel="clusters"/>
+    <link href="/api/datacenters/00000001-0001-0001-0001-0000000000f1/networks" rel="networks"/>
+    <link href="/api/datacenters/00000001-0001-0001-0001-0000000000f1/permissions" rel="permissions"/>
+    <link href="/api/datacenters/00000001-0001-0001-0001-0000000000f1/quotas" rel="quotas"/>
+    <link href="/api/datacenters/00000001-0001-0001-0001-0000000000f1/qoss" rel="qoss"/>
+    <link href="/api/datacenters/00000001-0001-0001-0001-0000000000f1/iscsibonds" rel="iscsibonds"/>
+    <local>false</local>
+    <storage_format>v3</storage_format>
+    <version major="3" minor="6"/>
+    <supported_versions>
+        <version major="3" minor="6"/>
+    </supported_versions>
+    <status>
+        <state>up</state>
+    </status>
+    <mac_pool href="/api/macpools/0000000d-000d-000d-000d-00000000037a" id="0000000d-000d-000d-000d-00000000037a"/>
+    <quota_mode>disabled</quota_mode>
+</data_center>
+EOX
+      expect(service).to receive(:resource_get).and_return(return_message)
+
+      data_center = service.get_resource_by_ems_ref("/api/datacenters/00000001-0001-0001-0001-0000000000f1")
+      expect(data_center[0].name).to eq "Default"
+    end
+
+    it "returns 404" do
+      expect(service).to receive(:resource_get).and_raise(Ovirt::MissingResourceError)
+      expect { service.get_resource_by_ems_ref("/api/vms/1234") }.to raise_error(Ovirt::MissingResourceError)
+    end
+  end
+
   context ".ovirt?" do
     it "false when ResourceNotFound" do
       expect_any_instance_of(described_class).to receive(:engine_ssh_public_key).and_raise(RestClient::ResourceNotFound)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Jason Frey
@@ -14,10 +14,12 @@ authors:
 - Richard Oliveri
 - Chris Portman
 - Adam Grare
+- Dávid Halász
+- pkliczewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,7 +165,7 @@ description: Ovirt provides a simple Object Oriented interface to the REST API o
   oVirt and RHEV-M servers.
 email:
 - fryguy9@gmail.com
-- bdunne@redhat.com
+- brandondunne@hotmail.com
 - keenan@thebrocks.net
 - jrafanie@redhat.com
 - gblomqui@redhat.com
@@ -172,6 +174,8 @@ email:
 - roliveri@redhat.com
 - chris.portman@optusnet.com.au
 - agrare@redhat.com
+- dhalasz@redhat.com
+- piotr.kliczewski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []