From bfbecf97d8d71c49e96f2b503951364bce5ca422 Mon Sep 17 00:00:00 2001
From: Keenan Brock <keenan@thebrocks.net>
Date: Fri, 9 Aug 2024 20:48:25 -0400
Subject: [PATCH] promote SupportsFeatureMixin to a global phenomenon

Adding supports feature to a few more core models.
It makes sense to have this as a base class for all
---
 app/models/application_record.rb                        | 1 +
 app/models/authentication.rb                            | 1 -
 app/models/availability_zone.rb                         | 1 -
 app/models/cloud_database.rb                            | 1 -
 app/models/cloud_network.rb                             | 1 -
 app/models/cloud_object_store_container.rb              | 1 -
 app/models/cloud_object_store_object.rb                 | 1 -
 app/models/cloud_subnet.rb                              | 1 -
 app/models/cloud_volume.rb                              | 1 -
 app/models/cloud_volume_backup.rb                       | 1 -
 app/models/cloud_volume_snapshot.rb                     | 1 -
 app/models/configuration_profile.rb                     | 1 -
 app/models/configuration_script_base.rb                 | 1 -
 app/models/configuration_script_source.rb               | 2 --
 app/models/configured_system.rb                         | 1 -
 app/models/container.rb                                 | 1 -
 app/models/container_group.rb                           | 1 -
 app/models/container_image.rb                           | 1 -
 app/models/container_node.rb                            | 2 --
 app/models/container_project.rb                         | 1 -
 app/models/container_replicator.rb                      | 1 -
 app/models/container_service.rb                         | 1 -
 app/models/container_template.rb                        | 1 -
 app/models/ems_cluster.rb                               | 1 -
 app/models/ext_management_system.rb                     | 2 --
 app/models/flavor.rb                                    | 1 -
 app/models/floating_ip.rb                               | 1 -
 app/models/host.rb                                      | 1 -
 app/models/host_aggregate.rb                            | 1 -
 app/models/host_initiator.rb                            | 1 -
 app/models/host_initiator_group.rb                      | 1 -
 app/models/manageiq/providers/container_manager.rb      | 1 -
 app/models/manageiq/providers/infra_manager.rb          | 2 --
 app/models/manageiq/providers/network_manager.rb        | 2 --
 app/models/manageiq/providers/physical_infra_manager.rb | 2 --
 app/models/manageiq/providers/storage_manager.rb        | 2 --
 app/models/miq_enterprise.rb                            | 1 -
 app/models/miq_region.rb                                | 1 -
 app/models/network_router.rb                            | 1 -
 app/models/network_service.rb                           | 1 -
 app/models/network_service_entry.rb                     | 1 -
 app/models/orchestration_stack.rb                       | 1 -
 app/models/orchestration_template.rb                    | 1 -
 app/models/physical_chassis.rb                          | 1 -
 app/models/physical_rack.rb                             | 1 -
 app/models/physical_server.rb                           | 1 -
 app/models/physical_server_profile.rb                   | 1 -
 app/models/physical_server_profile_template.rb          | 1 -
 app/models/physical_storage.rb                          | 2 --
 app/models/physical_storage_family.rb                   | 1 -
 app/models/physical_switch.rb                           | 1 -
 app/models/placement_group.rb                           | 1 -
 app/models/provider.rb                                  | 1 -
 app/models/security_group.rb                            | 1 -
 app/models/security_policy.rb                           | 1 -
 app/models/security_policy_rule.rb                      | 1 -
 app/models/service.rb                                   | 2 --
 app/models/service_template.rb                          | 2 --
 app/models/storage.rb                                   | 1 -
 app/models/storage_resource.rb                          | 1 -
 app/models/storage_service.rb                           | 1 -
 app/models/vm_or_template.rb                            | 1 -
 app/models/volume_mapping.rb                            | 1 -
 app/models/zone.rb                                      | 1 -
 64 files changed, 1 insertion(+), 73 deletions(-)

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index f2bb3d7782a..c14f9966070 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -12,6 +12,7 @@ class ApplicationRecord < ActiveRecord::Base
   include ArHrefSlug
   include ToModelHash
   include ArVisibleAttribute
+  include SupportsFeatureMixin
 
   extend ArTableLock
   extend ArReferences
diff --git a/app/models/authentication.rb b/app/models/authentication.rb
index b601a39e34a..abf8d5034e1 100644
--- a/app/models/authentication.rb
+++ b/app/models/authentication.rb
@@ -2,7 +2,6 @@ class Authentication < ApplicationRecord
   acts_as_miq_taggable
   include ImportExport
   include YamlImportExportMixin
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
   def self.new(*args, &block)
     if self == Authentication && (args.empty? || args.first.kind_of?(Hash))
diff --git a/app/models/availability_zone.rb b/app/models/availability_zone.rb
index cc5b5348cdb..92604b7dc7f 100644
--- a/app/models/availability_zone.rb
+++ b/app/models/availability_zone.rb
@@ -1,5 +1,4 @@
 class AvailabilityZone < ApplicationRecord
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
   include Metric::CiMixin
   include EventMixin
diff --git a/app/models/cloud_database.rb b/app/models/cloud_database.rb
index 7b60096dac6..b20e83c2892 100644
--- a/app/models/cloud_database.rb
+++ b/app/models/cloud_database.rb
@@ -2,7 +2,6 @@ class CloudDatabase < ApplicationRecord
   include AsyncDeleteMixin
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
 
   belongs_to :ext_management_system, :foreign_key => :ems_id, :class_name => "ManageIQ::Providers::CloudManager"
   belongs_to :cloud_tenant
diff --git a/app/models/cloud_network.rb b/app/models/cloud_network.rb
index 592dcfba120..09bda4e9ee3 100644
--- a/app/models/cloud_network.rb
+++ b/app/models/cloud_network.rb
@@ -1,6 +1,5 @@
 class CloudNetwork < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
 
diff --git a/app/models/cloud_object_store_container.rb b/app/models/cloud_object_store_container.rb
index 7b9a676de89..195c723313d 100644
--- a/app/models/cloud_object_store_container.rb
+++ b/app/models/cloud_object_store_container.rb
@@ -9,7 +9,6 @@ class CloudObjectStoreContainer < ApplicationRecord
   include ProviderObjectMixin
   include NewWithTypeStiMixin
   include ProcessTasksMixin
-  include SupportsFeatureMixin
   include CustomActionsMixin
 
   include Operations
diff --git a/app/models/cloud_object_store_object.rb b/app/models/cloud_object_store_object.rb
index e343a3806de..12eac37495e 100644
--- a/app/models/cloud_object_store_object.rb
+++ b/app/models/cloud_object_store_object.rb
@@ -9,7 +9,6 @@ class CloudObjectStoreObject < ApplicationRecord
   include ProviderObjectMixin
   include NewWithTypeStiMixin
   include ProcessTasksMixin
-  include SupportsFeatureMixin
 
   include Operations
 
diff --git a/app/models/cloud_subnet.rb b/app/models/cloud_subnet.rb
index 708156b8064..243c4363878 100644
--- a/app/models/cloud_subnet.rb
+++ b/app/models/cloud_subnet.rb
@@ -1,6 +1,5 @@
 class CloudSubnet < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
 
diff --git a/app/models/cloud_volume.rb b/app/models/cloud_volume.rb
index 96db05ba9ba..e7f7401c223 100644
--- a/app/models/cloud_volume.rb
+++ b/app/models/cloud_volume.rb
@@ -2,7 +2,6 @@ class CloudVolume < ApplicationRecord
   include NewWithTypeStiMixin
   include ProviderObjectMixin
   include AsyncDeleteMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
   include EmsRefreshMixin
diff --git a/app/models/cloud_volume_backup.rb b/app/models/cloud_volume_backup.rb
index 0a15d70e22e..9e9ecf615e0 100644
--- a/app/models/cloud_volume_backup.rb
+++ b/app/models/cloud_volume_backup.rb
@@ -1,7 +1,6 @@
 class CloudVolumeBackup < ApplicationRecord
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
 
   acts_as_miq_taggable
diff --git a/app/models/cloud_volume_snapshot.rb b/app/models/cloud_volume_snapshot.rb
index 2fab9887c47..6eede703dc1 100644
--- a/app/models/cloud_volume_snapshot.rb
+++ b/app/models/cloud_volume_snapshot.rb
@@ -1,7 +1,6 @@
 class CloudVolumeSnapshot < ApplicationRecord
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
   include EmsRefreshMixin
diff --git a/app/models/configuration_profile.rb b/app/models/configuration_profile.rb
index 5007d5053b3..8a304ff3e34 100644
--- a/app/models/configuration_profile.rb
+++ b/app/models/configuration_profile.rb
@@ -1,6 +1,5 @@
 class ConfigurationProfile < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
 
   acts_as_miq_taggable
   belongs_to :manager, :class_name => 'ExtManagementSystem'
diff --git a/app/models/configuration_script_base.rb b/app/models/configuration_script_base.rb
index 38cf64c2b4d..e62517584a2 100644
--- a/app/models/configuration_script_base.rb
+++ b/app/models/configuration_script_base.rb
@@ -23,5 +23,4 @@ class ConfigurationScriptBase < ApplicationRecord
   scope :with_manager, ->(manager_id) { where(:manager_id => manager_id) }
 
   include ProviderObjectMixin
-  include SupportsFeatureMixin
 end
diff --git a/app/models/configuration_script_source.rb b/app/models/configuration_script_source.rb
index b656ef3977d..cd7ce030bf5 100644
--- a/app/models/configuration_script_source.rb
+++ b/app/models/configuration_script_source.rb
@@ -1,8 +1,6 @@
 class ConfigurationScriptSource < ApplicationRecord
   acts_as_miq_taggable
 
-  include SupportsFeatureMixin
-
   has_many    :configuration_script_payloads, :dependent => :destroy
   belongs_to  :authentication
   belongs_to  :manager, :class_name => "ExtManagementSystem"
diff --git a/app/models/configured_system.rb b/app/models/configured_system.rb
index 66e75477343..ca0d220f4dd 100644
--- a/app/models/configured_system.rb
+++ b/app/models/configured_system.rb
@@ -1,6 +1,5 @@
 class ConfiguredSystem < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CustomAttributeMixin
 
   acts_as_miq_taggable
diff --git a/app/models/container.rb b/app/models/container.rb
index f2093b1fa4e..e916f3d985b 100644
--- a/app/models/container.rb
+++ b/app/models/container.rb
@@ -1,5 +1,4 @@
 class Container < ApplicationRecord
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
   include ArchivedMixin
   include Purging
diff --git a/app/models/container_group.rb b/app/models/container_group.rb
index 14efe3b6e08..574ff7d7f48 100644
--- a/app/models/container_group.rb
+++ b/app/models/container_group.rb
@@ -1,7 +1,6 @@
 class ContainerGroup < ApplicationRecord
   acts_as_miq_taggable
 
-  include SupportsFeatureMixin
   include ComplianceMixin
   include CustomAttributeMixin
   include MiqPolicyMixin
diff --git a/app/models/container_image.rb b/app/models/container_image.rb
index e8937013e0d..2d61a19a9f4 100644
--- a/app/models/container_image.rb
+++ b/app/models/container_image.rb
@@ -1,7 +1,6 @@
 class ContainerImage < ApplicationRecord
   acts_as_miq_taggable
 
-  include SupportsFeatureMixin
   include ComplianceMixin
   include MiqPolicyMixin
   include ScanningMixin
diff --git a/app/models/container_node.rb b/app/models/container_node.rb
index 9e3c23fa7a0..4d137ffcaa7 100644
--- a/app/models/container_node.rb
+++ b/app/models/container_node.rb
@@ -1,12 +1,10 @@
 class ContainerNode < ApplicationRecord
   acts_as_miq_taggable
 
-  include SupportsFeatureMixin
   include ComplianceMixin
   include MiqPolicyMixin
   include NewWithTypeStiMixin
   include TenantIdentityMixin
-  include SupportsFeatureMixin
   include ArchivedMixin
   include CustomActionsMixin
   include Purging
diff --git a/app/models/container_project.rb b/app/models/container_project.rb
index c992f5c37ed..8b1d72753f9 100644
--- a/app/models/container_project.rb
+++ b/app/models/container_project.rb
@@ -1,7 +1,6 @@
 class ContainerProject < ApplicationRecord
   acts_as_miq_taggable
 
-  include SupportsFeatureMixin
   include CustomAttributeMixin
   include ArchivedMixin
   include MiqPolicyMixin
diff --git a/app/models/container_replicator.rb b/app/models/container_replicator.rb
index cf80c4d9ca3..c8c1c85ec81 100644
--- a/app/models/container_replicator.rb
+++ b/app/models/container_replicator.rb
@@ -1,7 +1,6 @@
 class ContainerReplicator < ApplicationRecord
   acts_as_miq_taggable
 
-  include SupportsFeatureMixin
   include ComplianceMixin
   include CustomAttributeMixin
   include MiqPolicyMixin
diff --git a/app/models/container_service.rb b/app/models/container_service.rb
index 8563e6ffd8c..352e6d601d5 100644
--- a/app/models/container_service.rb
+++ b/app/models/container_service.rb
@@ -1,6 +1,5 @@
 class ContainerService < ApplicationRecord
   include CustomAttributeMixin
-  include SupportsFeatureMixin
   # :name, :uid, :creation_timestamp, :resource_version, :namespace
   # :labels, :selector, :protocol, :port, :container_port, :portal_ip, :session_affinity
 
diff --git a/app/models/container_template.rb b/app/models/container_template.rb
index 764509442a3..073c649dc6e 100644
--- a/app/models/container_template.rb
+++ b/app/models/container_template.rb
@@ -1,7 +1,6 @@
 class ContainerTemplate < ApplicationRecord
   include CustomAttributeMixin
   include CustomActionsMixin
-  include SupportsFeatureMixin
 
   belongs_to :ext_management_system, :foreign_key => "ems_id"
   belongs_to :container_project
diff --git a/app/models/ems_cluster.rb b/app/models/ems_cluster.rb
index 9666cd76df0..2b64752a888 100644
--- a/app/models/ems_cluster.rb
+++ b/app/models/ems_cluster.rb
@@ -1,5 +1,4 @@
 class EmsCluster < ApplicationRecord
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
   include EventMixin
   include TenantIdentityMixin
diff --git a/app/models/ext_management_system.rb b/app/models/ext_management_system.rb
index d7b5a8ae246..a528516f26b 100644
--- a/app/models/ext_management_system.rb
+++ b/app/models/ext_management_system.rb
@@ -1,6 +1,5 @@
 class ExtManagementSystem < ApplicationRecord
   include CustomActionsMixin
-  include SupportsFeatureMixin
   include ExternalUrlMixin
   include VerifyCredentialsMixin
   include SupportsAttribute
@@ -200,7 +199,6 @@ def validate_zone_not_maintenance_when_ems_enabled?
   include UuidMixin
   include EmsRefresh::Manager
   include TenancyMixin
-  include SupportsFeatureMixin
   include ComplianceMixin
   include CustomAttributeMixin
 
diff --git a/app/models/flavor.rb b/app/models/flavor.rb
index 98b9d4ff91d..4758bc7d11e 100644
--- a/app/models/flavor.rb
+++ b/app/models/flavor.rb
@@ -1,7 +1,6 @@
 class Flavor < ApplicationRecord
   include NewWithTypeStiMixin
   include CloudTenancyMixin
-  include SupportsFeatureMixin
 
   acts_as_miq_taggable
 
diff --git a/app/models/floating_ip.rb b/app/models/floating_ip.rb
index 17b455181d4..9bc3fcc3f00 100644
--- a/app/models/floating_ip.rb
+++ b/app/models/floating_ip.rb
@@ -1,6 +1,5 @@
 class FloatingIp < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
 
   acts_as_miq_taggable
diff --git a/app/models/host.rb b/app/models/host.rb
index b201058ac7c..daa217f9c38 100644
--- a/app/models/host.rb
+++ b/app/models/host.rb
@@ -6,7 +6,6 @@
 require 'metadata/ScanProfile/HostScanProfiles'
 
 class Host < ApplicationRecord
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
   include TenantIdentityMixin
   include DeprecationMixin
diff --git a/app/models/host_aggregate.rb b/app/models/host_aggregate.rb
index 4fecbb1ae6f..14bf146776d 100644
--- a/app/models/host_aggregate.rb
+++ b/app/models/host_aggregate.rb
@@ -1,5 +1,4 @@
 class HostAggregate < ApplicationRecord
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
   include Metric::CiMixin
   include EventMixin
diff --git a/app/models/host_initiator.rb b/app/models/host_initiator.rb
index a102d23500e..4f6f1f374cd 100644
--- a/app/models/host_initiator.rb
+++ b/app/models/host_initiator.rb
@@ -1,7 +1,6 @@
 class HostInitiator < ApplicationRecord
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
   include CustomActionsMixin
   include EmsRefreshMixin
 
diff --git a/app/models/host_initiator_group.rb b/app/models/host_initiator_group.rb
index bcbd152f4d4..6b0ec0696b8 100644
--- a/app/models/host_initiator_group.rb
+++ b/app/models/host_initiator_group.rb
@@ -1,7 +1,6 @@
 class HostInitiatorGroup < ApplicationRecord
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
   include CustomActionsMixin
   include EmsRefreshMixin
 
diff --git a/app/models/manageiq/providers/container_manager.rb b/app/models/manageiq/providers/container_manager.rb
index d207bf60fe2..3bfabacacf9 100644
--- a/app/models/manageiq/providers/container_manager.rb
+++ b/app/models/manageiq/providers/container_manager.rb
@@ -1,6 +1,5 @@
 module ManageIQ::Providers
   class ContainerManager < BaseManager
-    include SupportsFeatureMixin
 
     has_many :container_nodes, -> { active }, # rubocop:disable Rails/HasManyOrHasOneDependent
              :foreign_key => :ems_id,
diff --git a/app/models/manageiq/providers/infra_manager.rb b/app/models/manageiq/providers/infra_manager.rb
index 8765842de85..5bb0efdcbaa 100644
--- a/app/models/manageiq/providers/infra_manager.rb
+++ b/app/models/manageiq/providers/infra_manager.rb
@@ -1,7 +1,5 @@
 module ManageIQ::Providers
   class InfraManager < BaseManager
-    include SupportsFeatureMixin
-
     has_many :distributed_virtual_switches, :dependent => :destroy, :foreign_key => :ems_id, :inverse_of => :ext_management_system
     has_many :distributed_virtual_lans, -> { distinct }, :through => :distributed_virtual_switches, :source => :lans
     has_many :host_virtual_switches, -> { distinct }, :through => :hosts
diff --git a/app/models/manageiq/providers/network_manager.rb b/app/models/manageiq/providers/network_manager.rb
index a031ae4faee..3bbd25ce403 100644
--- a/app/models/manageiq/providers/network_manager.rb
+++ b/app/models/manageiq/providers/network_manager.rb
@@ -1,7 +1,5 @@
 module ManageIQ::Providers
   class NetworkManager < BaseManager
-    include SupportsFeatureMixin
-
     PROVIDER_NAME = "Network Manager".freeze
 
     class << model_name
diff --git a/app/models/manageiq/providers/physical_infra_manager.rb b/app/models/manageiq/providers/physical_infra_manager.rb
index bf5643ee58d..0752006795d 100644
--- a/app/models/manageiq/providers/physical_infra_manager.rb
+++ b/app/models/manageiq/providers/physical_infra_manager.rb
@@ -1,7 +1,5 @@
 module ManageIQ::Providers
   class PhysicalInfraManager < BaseManager
-    include SupportsFeatureMixin
-
     has_many :physical_chassis,  :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system
     has_many :physical_racks,    :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system
     has_many :physical_servers,  :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system
diff --git a/app/models/manageiq/providers/storage_manager.rb b/app/models/manageiq/providers/storage_manager.rb
index 0ad2a4f7ebf..357fd9fa051 100644
--- a/app/models/manageiq/providers/storage_manager.rb
+++ b/app/models/manageiq/providers/storage_manager.rb
@@ -1,7 +1,5 @@
 module ManageIQ::Providers
   class StorageManager < ManageIQ::Providers::BaseManager
-    include SupportsFeatureMixin
-
     has_many :cloud_tenants, :foreign_key => :ems_id, :dependent => :destroy
     has_many :volume_availability_zones, :class_name => "AvailabilityZone", :foreign_key => :ems_id, :dependent => :destroy
 
diff --git a/app/models/miq_enterprise.rb b/app/models/miq_enterprise.rb
index 27178f1e084..7b2c354ee13 100644
--- a/app/models/miq_enterprise.rb
+++ b/app/models/miq_enterprise.rb
@@ -16,7 +16,6 @@ class MiqEnterprise < ApplicationRecord
 
   acts_as_miq_taggable
 
-  include SupportsFeatureMixin
   include MiqPolicyMixin
   include Metric::CiMixin
 
diff --git a/app/models/miq_region.rb b/app/models/miq_region.rb
index 9369f0a2bb3..396dc2687d7 100644
--- a/app/models/miq_region.rb
+++ b/app/models/miq_region.rb
@@ -26,7 +26,6 @@ class MiqRegion < ApplicationRecord
   include ConfigurationManagementMixin
 
   include MiqPolicyMixin
-  include SupportsFeatureMixin
   include Metric::CiMixin
 
   alias_method :all_storages,           :storages
diff --git a/app/models/network_router.rb b/app/models/network_router.rb
index e680bd5729f..6f2075313e8 100644
--- a/app/models/network_router.rb
+++ b/app/models/network_router.rb
@@ -1,6 +1,5 @@
 class NetworkRouter < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
 
diff --git a/app/models/network_service.rb b/app/models/network_service.rb
index 372e8e998dd..1294bb20c73 100644
--- a/app/models/network_service.rb
+++ b/app/models/network_service.rb
@@ -1,6 +1,5 @@
 class NetworkService < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
 
diff --git a/app/models/network_service_entry.rb b/app/models/network_service_entry.rb
index 440cb7e8af2..dd3e170b5d1 100644
--- a/app/models/network_service_entry.rb
+++ b/app/models/network_service_entry.rb
@@ -1,6 +1,5 @@
 class NetworkServiceEntry < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
 
diff --git a/app/models/orchestration_stack.rb b/app/models/orchestration_stack.rb
index 510290f7c7b..bbc23480c62 100644
--- a/app/models/orchestration_stack.rb
+++ b/app/models/orchestration_stack.rb
@@ -8,7 +8,6 @@ class OrchestrationStack < ApplicationRecord
   include RetirementMixin
   include TenantIdentityMixin
   include CustomActionsMixin
-  include SupportsFeatureMixin
   include CiFeatureMixin
   include CloudTenancyMixin
   include EmsRefreshMixin
diff --git a/app/models/orchestration_template.rb b/app/models/orchestration_template.rb
index d1b4b08fe84..c0039adb233 100644
--- a/app/models/orchestration_template.rb
+++ b/app/models/orchestration_template.rb
@@ -1,6 +1,5 @@
 require 'digest/md5'
 class OrchestrationTemplate < ApplicationRecord
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
 
   acts_as_miq_taggable
diff --git a/app/models/physical_chassis.rb b/app/models/physical_chassis.rb
index 08909e7bd1e..66868ba219d 100644
--- a/app/models/physical_chassis.rb
+++ b/app/models/physical_chassis.rb
@@ -1,5 +1,4 @@
 class PhysicalChassis < ApplicationRecord
-  include SupportsFeatureMixin
   include EventMixin
   include EmsRefreshMixin
   include CustomActionsMixin
diff --git a/app/models/physical_rack.rb b/app/models/physical_rack.rb
index 998e1238a0f..0e8f8283f28 100644
--- a/app/models/physical_rack.rb
+++ b/app/models/physical_rack.rb
@@ -1,5 +1,4 @@
 class PhysicalRack < ApplicationRecord
-  include SupportsFeatureMixin
   include EmsRefreshMixin
   include CustomActionsMixin
 
diff --git a/app/models/physical_server.rb b/app/models/physical_server.rb
index 36059b27271..eedd1152ef1 100644
--- a/app/models/physical_server.rb
+++ b/app/models/physical_server.rb
@@ -4,7 +4,6 @@ class PhysicalServer < ApplicationRecord
   include NewWithTypeStiMixin
   include MiqPolicyMixin
   include TenantIdentityMixin
-  include SupportsFeatureMixin
   include EventMixin
   include ProviderObjectMixin
   include ComplianceMixin
diff --git a/app/models/physical_server_profile.rb b/app/models/physical_server_profile.rb
index 765a465d41e..0c19d71a1b9 100644
--- a/app/models/physical_server_profile.rb
+++ b/app/models/physical_server_profile.rb
@@ -3,7 +3,6 @@ class PhysicalServerProfile < ApplicationRecord
 
   include NewWithTypeStiMixin
   include TenantIdentityMixin
-  include SupportsFeatureMixin
   include EventMixin
   include ProviderObjectMixin
   include EmsRefreshMixin
diff --git a/app/models/physical_server_profile_template.rb b/app/models/physical_server_profile_template.rb
index d673b30506f..589e0444384 100644
--- a/app/models/physical_server_profile_template.rb
+++ b/app/models/physical_server_profile_template.rb
@@ -3,7 +3,6 @@ class PhysicalServerProfileTemplate < ApplicationRecord
 
   include NewWithTypeStiMixin
   include TenantIdentityMixin
-  include SupportsFeatureMixin
   include ProviderObjectMixin
   include EmsRefreshMixin
 
diff --git a/app/models/physical_storage.rb b/app/models/physical_storage.rb
index e09a1e8c1cc..1594f49433f 100644
--- a/app/models/physical_storage.rb
+++ b/app/models/physical_storage.rb
@@ -1,8 +1,6 @@
 class PhysicalStorage < ApplicationRecord
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
   include CustomActionsMixin
   include EmsRefreshMixin
   include EventMixin
diff --git a/app/models/physical_storage_family.rb b/app/models/physical_storage_family.rb
index e30517f6569..94fc62d3e30 100644
--- a/app/models/physical_storage_family.rb
+++ b/app/models/physical_storage_family.rb
@@ -1,6 +1,5 @@
 class PhysicalStorageFamily < ApplicationRecord
   include ProviderObjectMixin
-  include SupportsFeatureMixin
 
   belongs_to :ext_management_system, :foreign_key => :ems_id
   has_many :physical_storages, :dependent => :nullify
diff --git a/app/models/physical_switch.rb b/app/models/physical_switch.rb
index e426daddf87..8c1ff81d42c 100644
--- a/app/models/physical_switch.rb
+++ b/app/models/physical_switch.rb
@@ -1,5 +1,4 @@
 class PhysicalSwitch < Switch
-  include SupportsFeatureMixin
   include EventMixin
   include EmsRefreshMixin
 
diff --git a/app/models/placement_group.rb b/app/models/placement_group.rb
index e26956d3697..7e728db7fdd 100644
--- a/app/models/placement_group.rb
+++ b/app/models/placement_group.rb
@@ -1,6 +1,5 @@
 class PlacementGroup < ApplicationRecord
   acts_as_miq_taggable
-  include SupportsFeatureMixin
   include NewWithTypeStiMixin
 
   belongs_to :ext_management_system, :foreign_key => :ems_id, :class_name => "ManageIQ::Providers::CloudManager", :inverse_of => :placement_groups
diff --git a/app/models/provider.rb b/app/models/provider.rb
index 0fc3f118d98..7b477f8a381 100644
--- a/app/models/provider.rb
+++ b/app/models/provider.rb
@@ -3,7 +3,6 @@ class Provider < ApplicationRecord
   include AuthenticationMixin
   include AsyncDeleteMixin
   include EmsRefresh::Manager
-  include SupportsFeatureMixin
   include TenancyMixin
   include UuidMixin
 
diff --git a/app/models/security_group.rb b/app/models/security_group.rb
index f1858c988ad..07dd5362c25 100644
--- a/app/models/security_group.rb
+++ b/app/models/security_group.rb
@@ -1,6 +1,5 @@
 class SecurityGroup < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
 
diff --git a/app/models/security_policy.rb b/app/models/security_policy.rb
index 81c6e4ca082..6971efa4c3c 100644
--- a/app/models/security_policy.rb
+++ b/app/models/security_policy.rb
@@ -1,6 +1,5 @@
 class SecurityPolicy < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
 
diff --git a/app/models/security_policy_rule.rb b/app/models/security_policy_rule.rb
index 5a0dfeddafc..96d2b530a27 100644
--- a/app/models/security_policy_rule.rb
+++ b/app/models/security_policy_rule.rb
@@ -1,6 +1,5 @@
 class SecurityPolicyRule < ApplicationRecord
   include NewWithTypeStiMixin
-  include SupportsFeatureMixin
   include CloudTenancyMixin
   include CustomActionsMixin
 
diff --git a/app/models/service.rb b/app/models/service.rb
index d9c8dc56997..3430027fec0 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -57,8 +57,6 @@ class Service < ApplicationRecord
   delegate :provision_dialog, :to => :miq_request, :allow_nil => true
   delegate :user, :to => :miq_request, :allow_nil => true
 
-  include SupportsFeatureMixin
-
   include CiFeatureMixin
   include CustomActionsMixin
   include CustomAttributeMixin
diff --git a/app/models/service_template.rb b/app/models/service_template.rb
index 5d74a21cb51..a4fa477fdd7 100644
--- a/app/models/service_template.rb
+++ b/app/models/service_template.rb
@@ -1,6 +1,4 @@
 class ServiceTemplate < ApplicationRecord
-  include SupportsFeatureMixin
-
   DEFAULT_PROCESS_DELAY_BETWEEN_GROUPS = 120
 
   GENERIC_ITEM_SUBTYPES = {
diff --git a/app/models/storage.rb b/app/models/storage.rb
index f781b8218d2..4cd0e2cec4e 100644
--- a/app/models/storage.rb
+++ b/app/models/storage.rb
@@ -38,7 +38,6 @@ class Storage < ApplicationRecord
   acts_as_miq_taggable
 
   include FilterableMixin
-  include SupportsFeatureMixin
   include Metric::CiMixin
   include StorageMixin
   include AsyncDeleteMixin
diff --git a/app/models/storage_resource.rb b/app/models/storage_resource.rb
index ea05d46f1bf..bda1fa41570 100644
--- a/app/models/storage_resource.rb
+++ b/app/models/storage_resource.rb
@@ -1,7 +1,6 @@
 class StorageResource < ApplicationRecord
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
   include CustomActionsMixin
 
   belongs_to :ext_management_system, :foreign_key => :ems_id
diff --git a/app/models/storage_service.rb b/app/models/storage_service.rb
index ac1a7259264..74045e3e812 100644
--- a/app/models/storage_service.rb
+++ b/app/models/storage_service.rb
@@ -1,7 +1,6 @@
 class StorageService < ApplicationRecord
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
   include CustomActionsMixin
   include EmsRefreshMixin
 
diff --git a/app/models/vm_or_template.rb b/app/models/vm_or_template.rb
index b5a2acd55c9..b2e583ab377 100644
--- a/app/models/vm_or_template.rb
+++ b/app/models/vm_or_template.rb
@@ -7,7 +7,6 @@ class VmOrTemplate < ApplicationRecord
   include NewWithTypeStiMixin
   include RetirementMixin
   include ScanningMixin
-  include SupportsFeatureMixin
   include SupportsAttribute
   include EmsRefreshMixin
 
diff --git a/app/models/volume_mapping.rb b/app/models/volume_mapping.rb
index 55bb9027f5e..d49f5920f61 100644
--- a/app/models/volume_mapping.rb
+++ b/app/models/volume_mapping.rb
@@ -1,7 +1,6 @@
 class VolumeMapping < ApplicationRecord
   include NewWithTypeStiMixin
   include ProviderObjectMixin
-  include SupportsFeatureMixin
   include CustomActionsMixin
 
   belongs_to :cloud_volume
diff --git a/app/models/zone.rb b/app/models/zone.rb
index a15d9350073..13f1e4b9c47 100644
--- a/app/models/zone.rb
+++ b/app/models/zone.rb
@@ -37,7 +37,6 @@ class Zone < ApplicationRecord
 
   include AuthenticationMixin
 
-  include SupportsFeatureMixin
   include Metric::CiMixin
   include AggregationMixin
   include ConfigurationManagementMixin