From 170262aaf871c4937b090dcf65b37cfa1ac3fa15 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Tue, 28 Jan 2025 15:44:13 -0500 Subject: [PATCH] Use default_blacklisted_event_names for filtered_events --- app/models/manageiq/providers/base_manager.rb | 2 +- .../providers/base_manager/event_catcher/runner.rb | 10 +++++----- spec/models/manageiq/providers/base_manager_spec.rb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/manageiq/providers/base_manager.rb b/app/models/manageiq/providers/base_manager.rb index c2e492346b5..dbfe65cb216 100644 --- a/app/models/manageiq/providers/base_manager.rb +++ b/app/models/manageiq/providers/base_manager.rb @@ -57,7 +57,7 @@ def self.http_proxy end def self.default_blacklisted_event_names - Array(::Settings.ems["ems_#{provider_name.underscore}"].try(:blacklisted_event_names)) + Array(::Settings.ems["ems_#{ems_type}"].try(:blacklisted_event_names)) end # Returns a description of the options that are stored in "options" field. diff --git a/app/models/manageiq/providers/base_manager/event_catcher/runner.rb b/app/models/manageiq/providers/base_manager/event_catcher/runner.rb index dbf6fd020cc..a2882d47cc9 100644 --- a/app/models/manageiq/providers/base_manager/event_catcher/runner.rb +++ b/app/models/manageiq/providers/base_manager/event_catcher/runner.rb @@ -13,7 +13,7 @@ def after_initialize do_exit("Unable to find instance for EMS ID [#{@cfg[:ems_id]}].", 1) if @ems.nil? do_exit("EMS ID [#{@cfg[:ems_id]}] failed authentication check.", 1) unless @ems.authentication_check.first - @filtered_events = @ems.blacklisted_event_names + @filtered_events = @ems.class.default_blacklisted_event_names _log.info("#{log_prefix} Event Catcher skipping the following events:\n#{@filtered_events.to_a.join("\n")}") configure_event_flooding_prevention if worker_settings.try(:[], :flooding_monitor_enabled) @@ -95,16 +95,16 @@ def before_exit(message, _exit_code) def sync_blacklisted_events return unless @ems - filters = @ems.blacklisted_event_names + filters = @ems.default_blacklisted_event_names if @filtered_events.nil? || @filtered_events != filters adds = filters - @filtered_events deletes = @filtered_events - filters @filtered_events = filters - _log.info("Synchronizing blacklisted events: #{filters}") - _log.info(" Blacklisted events added: #{adds}") - _log.info(" Blacklisted events deleted: #{deletes}") + _log.info("Synchronizing filtered events: #{filters}") + _log.info(" Filtered events added: #{adds}") + _log.info(" Filtered events deleted: #{deletes}") end end diff --git a/spec/models/manageiq/providers/base_manager_spec.rb b/spec/models/manageiq/providers/base_manager_spec.rb index c92d33ec936..88efa2e03b0 100644 --- a/spec/models/manageiq/providers/base_manager_spec.rb +++ b/spec/models/manageiq/providers/base_manager_spec.rb @@ -12,7 +12,7 @@ } } ) - allow(described_class).to receive(:provider_name).and_return('SomeProvider') + allow(described_class).to receive(:ems_type).and_return(:some_provider) expect(described_class.default_blacklisted_event_names).to eq(%w[ev1 ev2]) end end