Skip to content

Commit

Permalink
Merge pull request #219 from borod108/rfe/graph
Browse files Browse the repository at this point in the history
Make graph refresh enabled by default
(cherry picked from commit 47c0093)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1553383
  • Loading branch information
masayag authored and simaishi committed Mar 8, 2018
1 parent b26d5d9 commit 47229d2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion config/settings.yml
Expand Up @@ -55,7 +55,7 @@
:user:
:ems_refresh:
:rhevm:
:inventory_object_refresh: false
:inventory_object_refresh: true
:pipeline: 40
:connections: 10
:redhat_network:
Expand Down
Expand Up @@ -10,6 +10,7 @@
@ems.default_endpoint.verify_ssl = OpenSSL::SSL::VERIFY_NONE
allow(@ems).to(receive(:supported_api_versions).and_return(%w(3 4)))
stub_settings_merge(:ems => { :ems_redhat => { :use_ovirt_engine_sdk => true } })
stub_settings_merge(:ems_refresh => { :rhevm => {:inventory_object_refresh => false }})
allow(Spec::Support::OvirtSDK::ConnectionVCR).to receive(:new).and_call_original
allow(Spec::Support::OvirtSDK::ConnectionVCR).to receive(:new).with(kind_of(Hash)) do |opts|
Spec::Support::OvirtSDK::ConnectionVCR.new(opts,
Expand Down
Expand Up @@ -11,6 +11,7 @@
@ems.update_authentication(:default => {:userid => "admin@internal", :password => "123456"})
@ems.default_endpoint.verify_ssl = OpenSSL::SSL::VERIFY_NONE
allow(@ems).to(receive(:supported_api_versions).and_return(%w(3 4)))
stub_settings_merge(:ems_refresh => { :rhevm => {:inventory_object_refresh => false }})
stub_settings_merge(:ems => { :ems_redhat => { :use_ovirt_engine_sdk => true } })
allow(Spec::Support::OvirtSDK::ConnectionVCR).to receive(:new).and_call_original
allow(Spec::Support::OvirtSDK::ConnectionVCR).to receive(:new).with(kind_of(Hash)) do |opts|
Expand Down
Expand Up @@ -85,6 +85,7 @@ def load_response_mock_for(filename)
end

it "should refresh a vm" do
stub_settings_merge(:ems_refresh => { :rhevm => {:inventory_object_refresh => false }})
allow_any_instance_of(@inventory_wrapper_class)
.to receive(:collect_clusters).and_return(load_response_mock_for('clusters'))
allow_any_instance_of(@inventory_wrapper_class)
Expand Down

0 comments on commit 47229d2

Please sign in to comment.