Skip to content

Use the new after_update_endpoints callback for RefreshWorker #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agrare wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use the new after_update_endpoints callback for RefreshWorker #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76aeb6c
Use the new after_update_endpoints callback for RefreshWorker
agrare Dec 6, 2022
1a491c5
wip
agrare Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/models/manageiq/providers/vmware/infra_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class Vmware::InfraManager < InfraManager
include VimConnectMixin
include CisConnectMixin

before_save :stop_event_monitor_queue_on_change, :stop_refresh_worker_queue_on_change
before_destroy :stop_event_monitor, :stop_refresh_worker

supports :catalog
Expand Down Expand Up @@ -345,9 +344,14 @@ def validate_remote_console_webmks_support
true
end

def after_update_authentication
def after_update_authentication(changes)
super
stop_refresh_worker_queue_on_credential_change
stop_refresh_worker_queue_on_credential_change(changes)
end

def after_update_endpoints(changes)
super
stop_refresh_worker_queue_on_change(changes)
end

def self.event_monitor_class
Expand Down
33 changes: 0 additions & 33 deletions spec/models/manageiq/providers/vmware/infra_manager_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,39 +239,6 @@
end
end

context "handling changes that may require EventCatcher restart" do
before(:each) do
zone = EvmSpecHelper.local_miq_server.zone
@ems = FactoryBot.create(:ems_vmware, :zone => zone)
end

it "will restart EventCatcher when ipaddress changes" do
@ems.update(:ipaddress => "1.1.1.1")
assert_event_catcher_restart_queued
end

it "will restart EventCatcher when hostname changes" do
@ems.update(:hostname => "something-else")
assert_event_catcher_restart_queued
end

it "will restart EventCatcher when credentials change" do
@ems.update_authentication(:default => {:userid => "new_user_id"})
assert_event_catcher_restart_queued
end

it "will not put multiple restarts of the EventCatcher on the queue" do
@ems.update(:ipaddress => "1.1.1.1")
@ems.update(:hostname => "something else")
assert_event_catcher_restart_queued
end

it "will not restart EventCatcher when name changes" do
@ems.update(:name => "something else")
expect(MiqQueue.count).to eq(0)
end
end

context "catalog types" do
it "#catalog_types" do
ems = FactoryBot.create(:ems_vmware)
Expand Down