diff --git a/app/models/manageiq/providers/redhat/discovery.rb b/app/models/manageiq/providers/redhat/discovery.rb index 5b667daab..e9698c714 100644 --- a/app/models/manageiq/providers/redhat/discovery.rb +++ b/app/models/manageiq/providers/redhat/discovery.rb @@ -6,10 +6,10 @@ module Providers module Redhat class Discovery def self.probe(ost) - Ovirt.logger = $rhevm_log if $rhevm_log + ::Ovirt.logger = $rhevm_log if $rhevm_log - if ManageIQ::NetworkDiscovery::Port.open?(ost, Ovirt::Service::DEFAULT_PORT) && - Ovirt::Service.ovirt?(:server => ost.ipaddr, :verify_ssl => false) + if ManageIQ::NetworkDiscovery::Port.open?(ost, ::Ovirt::Service::DEFAULT_PORT) && + ::Ovirt::Service.ovirt?(:server => ost.ipaddr, :verify_ssl => false) ost.hypervisor << :rhevm end end diff --git a/spec/models/manageiq/providers/redhat/discovery_spec.rb b/spec/models/manageiq/providers/redhat/discovery_spec.rb new file mode 100644 index 000000000..a62a50bd2 --- /dev/null +++ b/spec/models/manageiq/providers/redhat/discovery_spec.rb @@ -0,0 +1,10 @@ +describe ManageIQ::Providers::Redhat::Discovery do + it ".probe" do + require 'ostruct' + allow(ManageIQ::NetworkDiscovery::Port).to receive(:open?).and_return(true) + allow(::Ovirt::Service).to receive(:ovirt?).and_return(true) + ost = OpenStruct.new(:ipaddr => "172.168.0.1", :hypervisor => []) + described_class.probe(ost) + expect(ost.hypervisor).to eq [:rhevm] + end +end