ovirt 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0f4293560478cd39aa761c4aaec2b68b4b48fb6
-  data.tar.gz: ae54f822fcb29c456eb8216b99e49e829eb666b0
+  metadata.gz: dc172ac5a494fe8fadb4903ac66e950a17cd9e16
+  data.tar.gz: 917e3cd03ddacd7a64e5880e8e7fb063fae59010
 SHA512:
-  metadata.gz: b820d2f7680c71664d9f4a066701ec9380c1527903ca747fc98b4e35f1362e3bcb2d19bed15fe58c523009e787e22a5e2526fe63a97e50ea82d16888a6d4e7c6
-  data.tar.gz: 86fc253644730f32b29bba7b83b8738af5cfac1ec1b7d1389212036467411c17a66007308be2d4f7b2c1c9164951ae4ed8f8b16d74645de889cb68d9585fcbbe
+  metadata.gz: 94cba5c058a105783ad3950e5b66215df36b84aef7b1b2b0df5efa1e8c480eaa51a420f9c574f39e27d2f4bea319d2ca593359c4541f229d55d48c9d9edb727d
+  data.tar.gz: e436a90440f21749c935a23241c85f9d6d9d2856527830d5e02af1f6d7cc5fe29b273ef5e498cdecb3e4cc2b3665269456447c9a84047876201ec1524b76f9e4

data/lib/ovirt/inventory.rb

@@ -99,6 +99,10 @@ module Ovirt
       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)

data/lib/ovirt/service.rb

@@ -1,4 +1,7 @@
 require 'nokogiri'
+require 'openssl'
+require 'rest-client'
+require 'uri'
 
 module Ovirt
   class Service
@@ -12,6 +15,12 @@ module Ovirt
     DEFAULT_SCHEME   = 'https'.freeze
     SESSION_ID_KEY   = 'JSESSIONID'.freeze
 
+    # The list of absolute URI paths where the API can be available:
+    CANDIDATE_API_PATHS = [
+      '/api',
+      '/ovirt-engine/api',
+    ].freeze
+
     attr_accessor :session_id
 
     def self.name_to_class(name)
@@ -28,6 +37,7 @@ module Ovirt
       REQUIRED_OPTIONS.each { |key| raise "No #{key} specified" unless @options.key?(key) }
       @password   = @options.delete(:password)
       @session_id = @options[:session_id]
+      @api_path   = @options[:path]
     end
 
     def inspect # just like the default inspect, but WITHOUT @password
@@ -145,8 +155,40 @@ module Ovirt
       node.xpath('status/state').text
     end
 
+    # Checks if the API is available in the given candidate path. It does so sending a request without
+    # authentication. If the API is available there it will respond with the "WWW-Autenticate" header
+    # and with the "RESTAPI" or "ENGINE" realm.
+    def probe_api_path(uri, path)
+      uri = URI.join(uri, path)
+      request = RestClient::Resource.new(uri.to_s, :verify_ssl => OpenSSL::SSL::VERIFY_NONE)
+      begin
+        request.get
+      rescue RestClient::Exception => exception
+        response = exception.response
+        if response.code == 401
+          www_authenticate = response.headers[:www_authenticate]
+          if www_authenticate =~ /^Basic realm="?(RESTAPI|ENGINE)"?$/
+            return true
+          end
+        end
+      end
+      false
+    end
+
+    # Probes all the candidate paths of the API, and returns the first that success. If all probes
+    # fail, then the first candidate will be returned.
+    def find_api_path(uri)
+      CANDIDATE_API_PATHS.detect { |path| probe_api_path(uri, path) } || CANDIDATE_API_PATHS.first
+    end
+
+    # Returns the path of the API, probing it if needed.
+    def api_path
+      @api_path ||= find_api_path(base_uri)
+    end
+
     def api_uri(path = nil)
-      uri = "#{base_uri}/api"
+      # Calculate the complete URI:
+      uri = URI.join(base_uri, api_path).to_s
       unless path.nil?
         parts = path.to_s.split('/')
         parts.shift if parts.first == ''    # Remove leading slash
@@ -164,7 +206,6 @@ module Ovirt
     end
 
     def engine_ssh_public_key
-      require "rest-client"
       RestClient::Resource.new("#{base_uri}/engine.ssh.key.txt", resource_options).get
     end
 
@@ -206,7 +247,6 @@ module Ovirt
     end
 
     def create_resource(path = nil)
-      require "rest-client"
       RestClient::Resource.new(api_uri(path), resource_options)
     end
 
@@ -270,14 +310,16 @@ module Ovirt
     end
 
     def base_uri
-      require 'uri'
       uri = URI::Generic.build(:scheme => scheme.to_s, :port => port)
       uri.hostname = server
       uri.to_s
     end
 
     def resource_options
-      headers = merge_headers('Prefer' => 'persistent-auth')
+      headers = merge_headers(
+        'Version' => '3',
+        'Prefer'  => 'persistent-auth',
+      )
       options = {}
 
       if session_id

data/lib/ovirt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jason Frey
@@ -16,10 +16,11 @@ authors:
 - Adam Grare
 - Dávid Halász
 - pkliczewski
+- Juan Hernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,6 +177,7 @@ email:
 - agrare@redhat.com
 - dhalasz@redhat.com
 - piotr.kliczewski@gmail.com
+- juan.hernandez@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []