ovirt 0.5.0 → 0.6.0

data/lib/ovirt/exception.rb

@@ -4,11 +4,11 @@ module Ovirt
 
   # Existence
   class TemplateAlreadyExists < Error; end
-  class VmAlreadyExists       < Error; end
+  class VmAlreadyExists < Error; end
 
   # Power State
   class VmAlreadyRunning < Error; end
-  class VmIsNotRunning   < Error; end
+  class VmIsNotRunning < Error; end
   class VmNotReadyToBoot < Error; end
 
   class UsageError < Error; end

data/lib/ovirt/inventory.rb

@@ -2,7 +2,7 @@ module Ovirt
   class Inventory
     attr_accessor :service
 
-    def initialize(options={})
+    def initialize(options = {})
       @service = Service.new(options)
     end
 
@@ -78,9 +78,9 @@ module Ovirt
 
     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?
-      return vm
+      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)
@@ -131,16 +131,16 @@ 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.collect do |key, methods|
+      SECONDARY_ITEMS.flat_map do |key, methods|
         primary_items[key].product(methods)
-      end.flatten(1)
+      end
     end
 
     def collect_primary_items
       jobs = primary_item_jobs
 
       results = collect_in_parallel(jobs) do |_, method|
-        self.send(method)
+        send(method)
       end
 
       jobs.zip(results).each_with_object({}) do |((key, _), result), hash|

data/lib/ovirt/logging.rb

@@ -0,0 +1,5 @@
+module Ovirt
+  module Logging
+    delegate :logger, :to => :Ovirt
+  end
+end

data/lib/ovirt/null_logger.rb

@@ -0,0 +1,11 @@
+require 'logger'
+
+module Ovirt
+  class NullLogger < Logger
+    def initialize(*_args)
+    end
+
+    def add(*_args, &_block)
+    end
+  end
+end

data/lib/ovirt/service.rb

@@ -2,6 +2,8 @@ require 'nokogiri'
 
 module Ovirt
   class Service
+    include Logging
+
     DEFAULT_OPTIONS  = {}
     REQUIRED_OPTIONS = [:server, :username, :password]
     DEFAULT_PORT_3_0 = 8443
@@ -20,16 +22,16 @@ module Ovirt
       klass.create_from_xml(self, xml)
     end
 
-    def initialize(options={})
+    def initialize(options = {})
       @options = DEFAULT_OPTIONS.merge(options)
       parse_domain_name
-      REQUIRED_OPTIONS.each { |key| raise "No #{key.to_s} specified" unless @options.has_key?(key) }
-      @password = @options.delete(:password)
+      REQUIRED_OPTIONS.each { |key| raise "No #{key} specified" unless @options.key?(key) }
+      @password   = @options.delete(:password)
       @session_id = @options[:session_id]
     end
 
     def inspect # just like the default inspect, but WITHOUT @password
-      "#<#{self.class.name}:0x#{(self.object_id << 1).to_s(16).rjust(14,'0')} @options=#{@options.inspect}>"
+      "#<#{self.class.name}:0x#{(object_id << 1).to_s(16).rjust(14, '0')} @options=#{@options.inspect}>"
     end
 
     def api(reload = false)
@@ -95,10 +97,10 @@ module Ovirt
     end
 
     def get_resource_by_ems_ref(uri_suffix, element_name = nil)
-      xml     = resource_get(uri_suffix)
-      doc     = Nokogiri::XML(xml)
+      xml            = resource_get(uri_suffix)
+      doc            = Nokogiri::XML(xml)
       element_name ||= doc.root.name
-      klass   = self.class.name_to_class(element_name)
+      klass          = self.class.name_to_class(element_name)
       xml_to_object(klass, doc.root)
     end
 
@@ -110,17 +112,16 @@ module Ovirt
         doc = Nokogiri::XML(xml)
       end
       element_name ||= uri_suffix.singularize
-      klass   = self.class.name_to_class(element_name)
+      klass          = self.class.name_to_class(element_name)
 
       xml_path = uri_suffix == 'api' ? element_name : "#{element_name.pluralize}/#{element_name}"
-      objects = doc.xpath("//#{xml_path}")
+      objects  = doc.xpath("//#{xml_path}")
       objects.collect { |obj| xml_to_object(klass, obj) }
     end
 
     def status(link)
       response = resource_get(link)
-
-      node = Base.xml_to_nokogiri(response)
+      node     = Base.xml_to_nokogiri(response)
       node.xpath('status/state').text
     end
 
@@ -137,7 +138,7 @@ module Ovirt
 
     def self.ovirt?(options)
       options[:username] = options[:password] = "_unused"
-      !self.new(options).engine_ssh_public_key.to_s.blank?
+      !new(options).engine_ssh_public_key.to_s.blank?
     rescue RestClient::ResourceNotFound
       false
     end
@@ -147,36 +148,36 @@ module Ovirt
       RestClient::Resource.new("#{base_uri}/engine.ssh.key.txt", resource_options).get
     end
 
-    def paginate_resource_get(path = nil, sort_by=:name, direction=:asc)
+    def paginate_resource_get(path = nil, sort_by = :name, direction = :asc)
       log_header = "#{self.class.name}#paginate_resource_get"
-      page = 1
-      full_xml = nil
+      page       = 1
+      full_xml   = nil
       loop do
         uri = "#{path}?search=sortby%20#{sort_by}%20#{direction}%20page%20#{page}"
-        partial_xml_str = self.resource_get(uri)
+        partial_xml_str = resource_get(uri)
         if full_xml.nil?
           full_xml = Nokogiri::XML(partial_xml_str)
         else
           partial_xml = Nokogiri::XML(partial_xml_str)
           break if partial_xml.root.children.count == 0
-          $rhevm_log.debug "#{log_header}: Combining resource elements for <#{path}> from page:<#{page}>" if $rhevm_log && $rhevm_log.debug?
+          logger.debug "#{log_header}: Combining resource elements for <#{path}> from page:<#{page}>"
           full_xml.root << partial_xml.root.children
         end
         page += 1
       end
-      $rhevm_log.debug "#{log_header}: Combined elements for <#{path}>.  Total elements:<#{full_xml.root.children.count}>" if $rhevm_log && $rhevm_log.debug?
-      return full_xml
+      logger.debug "#{log_header}: Combined elements for <#{path}>.  Total elements:<#{full_xml.root.children.count}>"
+      full_xml
     end
 
     def resource_get(path = nil)
       resource_verb(path, :get)
     end
 
-    def resource_put(path, payload, additional_headers={:content_type => :xml, :accept => :xml})
+    def resource_put(path, payload, additional_headers = {:content_type => :xml, :accept => :xml})
       resource_verb(path, :put, payload, additional_headers)
     end
 
-    def resource_post(path, payload, additional_headers={:content_type => :xml, :accept => :xml})
+    def resource_post(path, payload, additional_headers = {:content_type => :xml, :accept => :xml})
       resource_verb(path, :post, payload, additional_headers)
     end
 
@@ -193,10 +194,9 @@ module Ovirt
 
     def resource_verb(path, verb, *args)
       log_header = "#{self.class.name}#resource_#{verb}"
-
-      resource = create_resource(path)
-      $rhevm_log.info "#{log_header}: Sending URL: <#{resource.url}>" if $rhevm_log
-      $rhevm_log.debug "#{log_header}: With args: <#{args.inspect}>" if $rhevm_log.try(:debug?)
+      resource   = create_resource(path)
+      logger.info "#{log_header}: Sending URL: <#{resource.url}>"
+      logger.debug "#{log_header}: With args: <#{args.inspect}>"
       resource.send(verb, *args) do |response, request, result, &block|
         case response.code
         when 200
@@ -208,7 +208,7 @@ module Ovirt
         end
       end
     rescue RestClient::Unauthorized
-      if self.session_id
+      if session_id
         self.session_id = nil
         retry
       else
@@ -217,22 +217,15 @@ module Ovirt
     rescue RestClient::ResourceNotFound, Ovirt::Error
       raise
     rescue Exception => e
-      msg = "#{log_header}: class = #{e.class.name}, message=#{e.message}, URI=#{resource ? resource.url : path}"
-      if $rhevm_log.nil?
-        puts msg
-      else
-        $rhevm_log.error msg
-      end
+      logger.error("#{log_header}: class = #{e.class.name}, message=#{e.message}, URI=#{resource ? resource.url : path}")
       raise
     end
 
     def parse_normal_response(response, resource)
       parse_set_cookie_header(response.headers[:set_cookie])
-      if $rhevm_log
-        log_header = "#{self.class.name}#parse_normal_response"
-        $rhevm_log.info  "#{log_header}: Return from URL: <#{resource.url}> Data length:#{response.length}"
-        $rhevm_log.debug "#{log_header}: Return from URL: <#{resource.url}> Data:#{response}" if $rhevm_log.debug?
-      end
+      log_header = "#{self.class.name}#parse_normal_response"
+      logger.info  "#{log_header}: Return from URL: <#{resource.url}> Data length:#{response.length}"
+      logger.debug "#{log_header}: Return from URL: <#{resource.url}> Data:#{response}"
       response
     end
 
@@ -262,11 +255,11 @@ module Ovirt
     end
 
     def resource_options
-      headers = merge_headers({ 'Prefer' => 'persistent-auth' })
+      headers = merge_headers('Prefer' => 'persistent-auth')
       options = {}
 
-      if self.session_id
-        headers[:cookie]     = "#{SESSION_ID_KEY}=#{self.session_id}"
+      if session_id
+        headers[:cookie]     = "#{SESSION_ID_KEY}=#{session_id}"
       else
         options[:user]       = fully_qualified_username
         options[:password]   = password
@@ -285,7 +278,7 @@ module Ovirt
     end
 
     def authorization_header
-      @authorization_header ||= { :authorization => "Basic #{authorization_value}" }
+      @authorization_header ||= {:authorization => "Basic #{authorization_value}"}
     end
 
     def authorization_value
@@ -315,9 +308,7 @@ module Ovirt
       @options[:username]
     end
 
-    def password
-      @password
-    end
+    attr_reader :password
 
     def domain
       @options[:domain]
@@ -345,6 +336,5 @@ module Ovirt
         end
       end
     end
-
   end
 end

data/lib/ovirt/snapshot.rb

@@ -10,11 +10,11 @@ module Ovirt
     end
 
     def delete
-      response = destroy
+      destroy
       while self[:snapshot_status] == "locked" || self[:snapshot_status] == "ok"
         sleep 2
         break if (obj = self.class.find_by_href(@service, self[:href])).nil?
-        self.replace(obj)
+        replace(obj)
       end
     end
   end

data/lib/ovirt/statistic.rb

@@ -3,10 +3,9 @@ module Ovirt
     self.top_level_strings = [:name, :description, :type, :unit]
 
     def self.parse_node_extended(node, hash)
-      values               = []
-      values_node          = node.xpath('values').first
-      values_type          = values_node['type']
-      values = values_node.xpath('value').collect do |v|
+      values_node = node.xpath('values').first
+      values_type = values_node['type']
+      values      = values_node.xpath('value').collect do |v|
         datum = v.xpath('datum').text
         case values_type
         when 'INTEGER'
@@ -18,7 +17,7 @@ module Ovirt
         end
         datum
       end
-      hash[:values]        = values
+      hash[:values] = values
 
       [:vm, :nic, :disk].each do |type|
         parent_node = node.xpath(type.to_s).first

data/lib/ovirt/storage_domain.rb

@@ -25,7 +25,7 @@ module Ovirt
 
           unless vg_hash.blank?
             parse_first_node(vg, :logical_unit, vg_hash,
-              :node => [:address, :port, :target, :username, :serial, :vendor_id, :product_id, :lun_mapping, :portal, :size, :paths])
+                             :node => [:address, :port, :target, :username, :serial, :vendor_id, :product_id, :lun_mapping, :portal, :size, :paths])
           end
         end
       end

data/lib/ovirt/template.rb

@@ -17,7 +17,7 @@ module Ovirt
                        :node_to_bool => [:enabled])
 
       parse_first_node_with_hash(node, 'cpu/topology', hash.store_path(:cpu, :topology, {}),
-                       :attribute_to_i => [:sockets, :cores])
+                                 :attribute_to_i => [:sockets, :cores])
 
       parse_first_node(node, :high_availability, hash,
                        :node_to_bool => [:enabled],
@@ -28,7 +28,7 @@ module Ovirt
                        :node      => [:kernel, :initrd, :cmdline])
 
       hash[:os][:boot_order] = boot_order = []
-      #Collect boot order
+      # Collect boot order
       node.xpath('os/boot').each do |boot|
         dev = boot['dev']
         boot_order << {:dev => dev} unless dev.blank?
@@ -41,37 +41,34 @@ module Ovirt
     end
 
     def os_type
-      self.attributes.fetch_path(:os, :type) || 'unassigned'
+      attributes.fetch_path(:os, :type) || 'unassigned'
     end
 
-    def getCfg(snap=nil)
-      #mor = snap ? getSnapMor(snap) : @vmMor
-      cfgProps = self.attributes
+    def getCfg(_snap = nil)
+      # TODO: Remove the following MiqException and any others
+      raise MiqException::MiqVimError, "Failed to retrieve configuration information for VM" if attributes.nil?
 
-      raise MiqException::MiqVimError, "Failed to retrieve configuration information for VM" if cfgProps.nil?
-
-      cfgHash = {}
-      cfgHash['displayname'] = cfgProps[:name]
-      cfgHash['guestos'] = cfgProps.fetch_path(:os, :type)
-      cfgHash['memsize'] = cfgProps[:memory] / 1048576  # in MB
-      cfgHash['numvcpu'] = cfgProps.fetch_path(:cpu, :sockets)
+      cfg_hash = {}
+      cfg_hash['displayname'] = attributes[:name]
+      cfg_hash['guestos']     = attributes.fetch_path(:os, :type)
+      cfg_hash['memsize']     = attributes[:memory] / 1_048_576  # in MB
+      cfg_hash['numvcpu']     = attributes.fetch_path(:cpu, :sockets)
 
       # Collect disk information
-      self.attributes[:disks] = self.send(:disks, :disk) if self[:disks].nil?
-      self.disks.each_with_index do |disk, idx|
+      attributes[:disks] = send(:disks, :disk) if self[:disks].nil?
+      disks.each_with_index do |disk, idx|
         storage_domain = disk[:storage_domains].first
-        storage_id = storage_domain && storage_domain[:id]
-        disk_key = disk[:image_id].blank? ? :id : :image_id
-        file_path = storage_id && ::File.join('/dev', storage_id, disk[disk_key])
+        storage_id     = storage_domain && storage_domain[:id]
+        disk_key       = disk[:image_id].blank? ? :id : :image_id
+        file_path      = storage_id && ::File.join('/dev', storage_id, disk[disk_key])
 
         tag = "scsi0:#{idx}"
-        cfgHash["#{tag}.present"]    = "true"
-        cfgHash["#{tag}.devicetype"] = "disk"
-        cfgHash["#{tag}.filename"]   = file_path.to_s
-        cfgHash["#{tag}.format"]     = disk[:format]
-        #cfgHash["#{tag}.mode"] = dev['backing']['diskMode']
+        cfg_hash["#{tag}.present"]    = "true"
+        cfg_hash["#{tag}.devicetype"] = "disk"
+        cfg_hash["#{tag}.filename"]   = file_path.to_s
+        cfg_hash["#{tag}.format"]     = disk[:format]
       end
-      return cfgHash
+      cfg_hash
     end
 
     REQUIRED_CLONE_PARAMETERS     = [:name, :cluster]
@@ -85,9 +82,9 @@ module Ovirt
       options[:storage] = Base.object_to_id(options[:storage]) if options[:storage]
 
       case options[:clone_type]
-      when :full;     clone_to_vm(options)
-      when :linked;   clone_to_vm(options)
-      when :skeletal; clone_to_vm_via_blank_template(options)
+      when :full     then clone_to_vm(options)
+      when :linked   then clone_to_vm(options)
+      when :skeletal then clone_to_vm_via_blank_template(options)
       end
     end
 
@@ -105,7 +102,7 @@ module Ovirt
       (CLONE_ATTRIBUTES_WITH_SCALARS + CLONE_ATTRIBUTES_WITH_HASHES).each do |key|
         options[key] ||= self[key]
       end
-      options[:os_type] ||= self.os_type
+      options[:os_type] ||= os_type
 
       skeleton_options = options.dup
       skeleton_options[:clone_type] = :linked
@@ -116,7 +113,7 @@ module Ovirt
     end
 
     def create_new_disks_from_template(vm, options)
-      self.disks.each do |disk_object|
+      disks.each do |disk_object|
         disk_options            = disk_object.attributes_for_new_disk
         disk_options[:sparse]   = options[:sparse]  unless options[:sparse].nil?
         disk_options[:storage]  = options[:storage] unless options[:storage].blank?
@@ -155,14 +152,14 @@ module Ovirt
             end
           end
 
-          xml.os(:type => options[:os_type] || self.os_type) do
+          xml.os(:type => options[:os_type] || os_type) do
             xml.boot(:dev => 'hd')
           end
 
           if options[:clone_type] == :full
             xml.disks do
               xml.clone_ true
-              self.disks.each do |disk_object|
+              disks.each do |disk_object|
                 xml.disk(:id => disk_object.attributes[:id]) do
                   xml.sparse options[:sparse] unless options[:sparse].nil?
                   xml.storage_domains { xml.storage_domain(:id => options[:storage]) } if options[:storage]

data/lib/ovirt/user.rb

@@ -5,7 +5,7 @@ module Ovirt
 
     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[:groups] = groups_node.xpath('group').collect(&:text) unless groups_node.nil?
     end
   end
 end

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/ovirt/vm.rb

@@ -49,8 +49,7 @@ module Ovirt
     end
 
     def destroy
-      # TODO:
-      # 1. If VM was running, wait for it to stop
+      # TODO: If VM was running, wait for it to stop
       begin
         stop
       rescue VmIsNotRunning
@@ -75,7 +74,7 @@ module Ovirt
       #     <state>pending</state>
       #   </status>
       # </action>
-      doc = Nokogiri::XML(response)
+      doc    = Nokogiri::XML(response)
       action = doc.xpath("//action").first
       raise Ovirt::Error, "No Action in Response: #{response.inspect}" if action.nil?
       action['href']
@@ -210,10 +209,8 @@ module Ovirt
       attach_payload(payload)
     end
 
-    def detach_payload_3_3(types)
-      update! do |xml|
-        xml.payloads
-      end
+    def detach_payload_3_3(_types)
+      update!(&:payloads)
     end
 
     # Attaches the +files+ as a floppy drive payload.
@@ -237,8 +234,8 @@ module Ovirt
         end
       end
     rescue Ovirt::Error => err
-      raise unless err.message =~ /disks .+ are locked/
-      raise VmNotReadyToBoot.new [err.message, err]
+      raise VmNotReadyToBoot, [err.message, err] if err.message =~ /disks .+ are locked/
+      raise
     end
 
     def boot_from_cdrom(iso_file_name)
@@ -255,8 +252,8 @@ module Ovirt
         end
       end
     rescue Ovirt::Error => err
-      raise unless err.message =~ /disks .+ are locked/
-      raise VmNotReadyToBoot.new [err.message, err]
+      raise VmNotReadyToBoot, [err.message, err] if err.message =~ /disks .+ are locked/
+      raise
     end
 
     def self.parse_xml(xml)
@@ -267,7 +264,7 @@ module Ovirt
                        :node => [:affinity])
 
       parse_first_node_with_hash(node, 'placement_policy/host', hash[:placement_policy][:host] = {},
-                       :attribute => [:id])
+                                 :attribute => [:id])
 
       parse_first_node(node, :memory_policy, hash,
                        :node_to_i => [:guaranteed])
@@ -323,12 +320,10 @@ module Ovirt
           xml.description desc
         end
       end
-      data = builder.doc.root.to_xml
-      path = "#{api_endpoint}/snapshots"
-
+      data     = builder.doc.root.to_xml
+      path     = "#{api_endpoint}/snapshots"
       response = @service.resource_post(path, data)
-
-      snap = Snapshot.create_from_xml(@service, response)
+      snap     = Snapshot.create_from_xml(@service, response)
 
       while snap[:snapshot_status] == "locked"
         sleep 2
@@ -337,16 +332,16 @@ module Ovirt
       snap
     end
 
-    def create_template(options={})
+    def create_template(options = {})
       builder = Nokogiri::XML::Builder.new do |xml|
         xml.template do
           xml.name options[:name]
           xml.vm(:id => self[:id])
         end
       end
-      data = builder.doc.root.to_xml
-
+      data     = builder.doc.root.to_xml
       response = @service.resource_post(:templates, data)
+
       Template.create_from_xml(@service, response)
     rescue Ovirt::Error => err
       raise TemplateAlreadyExists, err.message if err.message.include?("Template name already exists")
@@ -359,10 +354,9 @@ module Ovirt
       ovirt_cloud_init_keys = %w(active_directory_ou authorized_ssh_keys dns_search dns_servers domain host_name input_locale nic_configurations org_name regenerate_ssh_keys root_password system_locale timezone ui_language user_locale user_name)
 
       require 'yaml'
-      raw_content = YAML.load(content)
-
-      hash = ovirt_cloud_init_keys.each_with_object({}) { |k, h| h[k] = raw_content.delete(k) }
-      custom_script = YAML.dump(raw_content).to_s.sub("---\n", "")
+      raw_content          = YAML.load(content)
+      hash                 = ovirt_cloud_init_keys.each_with_object({}) { |k, h| h[k] = raw_content.delete(k) }
+      custom_script        = YAML.dump(raw_content).to_s.sub("---\n", "")
       hash[:custom_script] = custom_script unless custom_script.blank?
       hash.delete_nils
     end

data/lib/ovirt.rb

@@ -2,6 +2,8 @@ require 'active_support/all'
 require 'more_core_extensions/all'
 
 require 'ovirt/exception'
+require 'ovirt/logging'
+require 'ovirt/null_logger'
 require 'ovirt/base'
 require 'ovirt/version'
 
@@ -32,3 +34,13 @@ require 'ovirt/template'
 require 'ovirt/user'
 require 'ovirt/vm'
 require 'ovirt/vmpool'
+
+module Ovirt
+  class << self
+    attr_writer :logger
+  end
+
+  def self.logger
+    @logger ||= NullLogger.new
+  end
+end

data/spec/base_spec.rb

@@ -1,19 +1,17 @@
-require 'spec_helper'
-
 describe Ovirt::Base do
   it ".api_endpoint" do
-    Ovirt::Base.api_endpoint.should          == "bases"
-    Ovirt::Template.api_endpoint.should      == "templates"
-    Ovirt::Cluster.api_endpoint.should       == "clusters"
-    Ovirt::Vm.api_endpoint.should            == "vms"
-    Ovirt::StorageDomain.api_endpoint.should == "storagedomains"
-    Ovirt::DataCenter.api_endpoint.should    == "datacenters"
+    expect(Ovirt::Base.api_endpoint).to          eq("bases")
+    expect(Ovirt::Template.api_endpoint).to      eq("templates")
+    expect(Ovirt::Cluster.api_endpoint).to       eq("clusters")
+    expect(Ovirt::Vm.api_endpoint).to            eq("vms")
+    expect(Ovirt::StorageDomain.api_endpoint).to eq("storagedomains")
+    expect(Ovirt::DataCenter.api_endpoint).to    eq("datacenters")
   end
 
   it ".href_to_guid" do
     guid = "1c92b67c-9d10-4f48-85bd-28ba2fd6d9b3"
     expect(Ovirt::Base.send(:href_to_guid, "/api/clusters/#{guid}")).to eq(guid)
     expect(Ovirt::Base.send(:href_to_guid, guid)).to                    eq(guid)
-    expect { Ovirt::Base.send(:href_to_guid, 12345) }.to                raise_error(ArgumentError)
+    expect { Ovirt::Base.send(:href_to_guid, 12_345) }.to               raise_error(ArgumentError)
   end
 end

data/spec/event_spec.rb

@@ -1,26 +1,16 @@
-require 'spec_helper'
-
 describe Ovirt::Event do
   context ".set_event_name" do
-    before :each do
-      @orig_log, $rhevm_log = $rhevm_log, double("logger")
-    end
-
-    after :each do
-      $rhevm_log = @orig_log
-    end
-
     it "sets the name corresponding to a valid code" do
       hash = {:code => 1}
       described_class.send(:set_event_name, hash)
-      hash[:name].should eq Ovirt::Event::EVENT_CODES[1]
+      expect(hash[:name]).to eq(Ovirt::Event::EVENT_CODES[1])
     end
 
     it "sets 'UNKNOWN' as the name with an invalid code" do
-      $rhevm_log.should_receive :warn
+      expect(Ovirt.logger).to receive(:warn).with("Ovirt::Event.set_event_name Unknown RHEVM event -1: Invalid Code")
       hash = {:code => -1, :description => "Invalid Code"}
       described_class.send(:set_event_name, hash)
-      hash[:name].should eq "UNKNOWN"
+      expect(hash[:name]).to eq("UNKNOWN")
     end
   end
 end