Merge pull request #937 from agrare/drop_overridden_default_blacklist…

…ed_event_names Drop default_blacklisted_event_names method
ManageIQ · Feb 19, 2025 · 28f7461 · 28f7461
2 parents dc6103d + b45bf0b
commit 28f7461
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 19 deletions.
diff --git a/app/models/manageiq/providers/vmware/cloud_manager.rb b/app/models/manageiq/providers/vmware/cloud_manager.rb
@@ -27,10 +27,6 @@ def self.description
     @description ||= "VMware vCloud".freeze
   end
 
-  def self.default_blacklisted_event_names
-    Settings.ems["ems_#{ems_type}"].blacklisted_event_names
-  end
-
   def self.params_for_create
     {
       :fields => [
@@ -281,10 +277,6 @@ def self.verify_credentials(args)
     end
   end
 
-  def self.default_blacklisted_event_names
-    []
-  end
-
   def self.hostname_required?
     true
   end

diff --git a/app/models/manageiq/providers/vmware/cloud_manager/event_catcher_mixin.rb b/app/models/manageiq/providers/vmware/cloud_manager/event_catcher_mixin.rb
@@ -59,6 +59,6 @@ def queue_event(event)
   end
 
   def filtered?(event)
-    filtered_events.include?(event.type)
+    @ems.filtered_event_namess.include?(event.type)
   end
 end
diff --git a/app/models/manageiq/providers/vmware/container_manager.rb b/app/models/manageiq/providers/vmware/container_manager.rb
@@ -15,10 +15,6 @@ def self.display_name(number = 1)
     n_('Container Provider (Vmware)', 'Container Providers (Vmware)', number)
   end
 
-  def self.default_blacklisted_event_names
-    Settings.ems["ems_#{ems_type}"].blacklisted_event_names
-  end
-
   def self.kubernetes_auth_options(options)
     {:bearer_token => options[:bearer] || wcp_login(options)}
   end

diff --git a/app/models/manageiq/providers/vmware/infra_manager.rb b/app/models/manageiq/providers/vmware/infra_manager.rb
@@ -337,7 +337,10 @@ def self.provision_class(via)
       end
     end
 
-    def self.default_blacklisted_event_names
+    # Override the .filtered_event_names method from core
+    # because ems_type is :vmwarews but the Settings key
+    # is ems_vmware
+    def self.filtered_event_names
       Settings.ems.ems_vmware.blacklisted_event_names
     end
 

diff --git a/app/models/manageiq/providers/vmware/infra_manager/event_catcher/runner.rb b/app/models/manageiq/providers/vmware/infra_manager/event_catcher/runner.rb
@@ -66,7 +66,7 @@ def filtered?(event)
 
     sub_event_type, display_name = sub_type_and_name(event)
 
-    return false unless filtered_events.include?(event_type) || filtered_events.include?(sub_event_type)
+    return false unless @ems.filtered_event_names.include?(event_type) || @ems.filtered_event_names.include?(sub_event_type)
 
     _log.info("#{log_prefix} Skipping caught event [#{display_name}] chainId [#{event['chainId']}]")
     true

diff --git a/app/models/manageiq/providers/vmware/network_manager.rb b/app/models/manageiq/providers/vmware/network_manager.rb
@@ -36,10 +36,6 @@ def self.hostname_required?
     false
   end
 
-  def self.default_blacklisted_event_names
-    Settings.ems["ems_#{ems_type}"].blacklisted_event_names
-  end
-
   def description
     @description ||= "VMware Cloud Network".freeze
   end