Move IsoDatastore from core

app/models/ext_management_system.rb

@@ -106,8 +106,6 @@ def self.create_from_params(params, endpoints, authentications)
   has_many :customization_scripts, :foreign_key => "manager_id", :dependent => :destroy, :inverse_of => :ext_management_system
   has_many :cloud_subnets, :foreign_key => :ems_id, :dependent => :destroy
 
-  has_one  :iso_datastore, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system
-
   belongs_to :zone
   belongs_to :zone_before_pause, :class_name => "Zone", :inverse_of => :paused_ext_management_systems # used for maintenance mode
 
@@ -129,6 +127,8 @@ def self.create_from_params(params, endpoints, authentications)
   has_many :ems_licenses,   :foreign_key => :ems_id, :dependent => :destroy, :inverse_of => :ext_management_system
   has_many :ems_extensions, :foreign_key => :ems_id, :dependent => :destroy, :inverse_of => :ext_management_system
 
+  has_many :iso_images, :through => :storages
+
   validates :name,     :presence => true, :uniqueness_when_changed => {:scope => [:tenant_id]}
   validates :hostname, :presence => true, :if => :hostname_required?
   validates :zone,     :presence => true
@@ -994,11 +994,6 @@ def self.class_by_ems(class_name)
   end
   delegate :class_by_ems, :to => :class
 
-  # @return [Boolean] true if a datastore exists for this type of ems
-  def self.datastore?
-    IsoDatastore.where(:ems_id => all).exists?
-  end
-
   def tenant_identity
     User.super_admin.tap { |u| u.current_group = tenant.default_miq_group }
   end

app/models/iso_image.rb

@@ -1,5 +1,5 @@
 class IsoImage < ApplicationRecord
-  belongs_to :iso_datastore
+  belongs_to :storage
   belongs_to :pxe_image_type
 
   has_many :customization_templates, :through => :pxe_image_type

app/models/manageiq/providers/inventory/persister/builder/infra_manager.rb

@@ -296,6 +296,14 @@ def vm_resource_pools
           )
         end
 
+        def iso_images
+          add_properties(
+            :parent_inventory_collections => %i[storages],
+            :manager_ref                  => %i[name],
+            :model_class                  => IsoImage
+          )
+        end
+
         private
 
         def root_folder_relationship_save_block

app/models/miq_request_workflow.rb

@@ -1405,7 +1405,7 @@ def allowed_images(options = {})
 
   def get_iso_images
     template = VmOrTemplate.find_by(:id => get_value(@values[:src_vm_id]))
-    template.try(:ext_management_system).try(:iso_datastore).try(:iso_images) || []
+    template.try(:ext_management_system).try(:iso_images) || []
   end
 
   def allowed_iso_images(_options = {})

app/models/storage.rb

@@ -22,6 +22,7 @@ class Storage < ApplicationRecord
   has_many :storage_files,       :dependent => :destroy
   has_many :storage_files_files, -> { where("rsc_type = 'file'") }, :class_name => "StorageFile", :foreign_key => "storage_id"
   has_many :files,               -> { where("rsc_type = 'file'") }, :class_name => "StorageFile", :foreign_key => "storage_id"
+  has_many :iso_images, :dependent => :destroy
 
   has_many :miq_events, :as => :target, :dependent => :destroy
 
@@ -80,6 +81,7 @@ class Storage < ApplicationRecord
   supports(:delete) { _("Only storage without VMs and Hosts can be removed") if vms_and_templates.any? || hosts.any? }
 
   supports_not :evacuate
+  supports_not :iso_datastore
 
   def to_s
     name

locale/en.yml

@@ -1456,7 +1456,6 @@ en:
       Host:                           Host
       HostInitiator:                  Host Initiators
       HostPerformance:                Performance - Host
-      IsoDatastore:                   ISO Datastore
       IsoImage:                       ISO Image
       LdapDomain:                     LDAP Domain
       LdapRegion:                     LDAP Region
@@ -1778,7 +1777,6 @@ en:
       hosts:                       Hosts
       host_initiator:              Host Initiator
       host_services:               Services
-      iso_datastore:               ISO Datastore
       iso_image:                   ISO Image
       lans:                        vLANs
       last_compliance:             Last Compliance History