Remove hardcoded types in favor of a supports feature check

Part of ManageIQ#19440
Fryguy · Aug 26, 2020 · 7f46472 · 7f46472
1 parent 349f28c
commit 7f46472
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/app/models/manageiq/providers/cloud_manager/template.rb b/app/models/manageiq/providers/cloud_manager/template.rb
@@ -11,16 +11,6 @@ def snapshot?
     !genealogy_parent.nil?
   end
 
-  def self.eligible_for_provisioning
-    super.where(:type => %w(ManageIQ::Providers::Amazon::CloudManager::Template
-                            ManageIQ::Providers::Azure::CloudManager::Template
-                            ManageIQ::Providers::Google::CloudManager::Template
-                            ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager::Template
-                            ManageIQ::Providers::Openstack::CloudManager::Template
-                            ManageIQ::Providers::Openstack::CloudManager::VolumeTemplate
-                            ManageIQ::Providers::Openstack::CloudManager::VolumeSnapshotTemplate))
-  end
-
   def self.class_by_ems(ext_management_system)
     ext_management_system.class::Template
   end

diff --git a/app/models/manageiq/providers/infra_manager/template.rb b/app/models/manageiq/providers/infra_manager/template.rb
@@ -1,13 +1,6 @@
 class ManageIQ::Providers::InfraManager::Template < MiqTemplate
   default_value_for :cloud, false
 
-  def self.eligible_for_provisioning
-    super.where(:type => %w(ManageIQ::Providers::Redhat::InfraManager::Template
-                            ManageIQ::Providers::Vmware::InfraManager::Template
-                            ManageIQ::Providers::Microsoft::InfraManager::Template
-                            ManageIQ::Providers::Kubevirt::InfraManager::Template))
-  end
-
   def self.display_name(number = 1)
     n_('Template', 'Templates', number)
   end

diff --git a/app/models/miq_template.rb b/app/models/miq_template.rb
@@ -35,7 +35,8 @@ def self.supports_kickstart_provisioning?
   delegate :supports_kickstart_provisioning?, :to => :class
 
   def self.eligible_for_provisioning
-    where(arel_table[:ems_id].not_eq(nil))
+    types = descendants.select(&:supports_provisioning?)
+    where(:type => types).where.not(:ems_id => nil)
   end
 
   def self.without_volume_templates