Host targeted refresh deleting and re-creating storage, switch, and lan records

app/models/manageiq/providers/redhat/inventory/collector/target_collection.rb

@@ -213,16 +213,21 @@ def infer_related_host_ems_refs_db!
     changed_hosts.each do |host|
       add_simple_target!(:ems_clusters, uuid_from_target(host.ems_cluster))
       host.storages.each do |storage|
-        add_simple_target!(:storagedomains, uuid_from_target(storage))
+        add_simple_target!(:storagedomains, storage.ems_ref)
+      end
+      host.switches.each do |switch|
+        add_simple_target!(:switches, switch.uid_ems)
       end
     end
   end
 
   def infer_related_host_ems_refs_api!
     hosts.each do |host|
       add_simple_target!(:ems_clusters, host.cluster.id)
-      host.network_attachments.each do |attachement|
-        add_simple_target!(:networks, attachement.network.id)
+      manager.with_provider_connection(VERSION_HASH) do |connection|
+        connection.follow_link(host.network_attachments).each do |attachment|
+          add_simple_target!(:switches, attachment.network.id)
+        end
       end
     end
   end

app/models/manageiq/providers/redhat/inventory/persister/definitions/infra_group/networks_collections.rb

@@ -8,7 +8,7 @@ def add_switches
         # TODO are switches shared across emses? Seems like we weren't filling ems_id
         builder.add_targeted_arel(
           lambda do |_inventory_collection|
-            ::Switch.where(:uid_ems => references(:networks))
+            ::Switch.where(:uid_ems => references(:switches))
           end
         )
       end

spec/models/manageiq/providers/redhat/infra_manager/refresh/ovirt_refresher_spec_common.rb

@@ -0,0 +1,14 @@
+module OvirtRefresherSpecCommon
+  extend ActiveSupport::Concern
+
+  def serialize_inventory(models = [])
+    skip_attributes = %w(updated_on last_refresh_date updated_at last_updated finish_time)
+    inventory = {}
+    models.each do |model|
+      inventory[model.name] = model.all.collect do |rec|
+        rec.attributes.except(*skip_attributes)
+      end.sort { |rec| rec["id"] }
+    end
+    inventory
+  end
+end

spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_graph_target_host_spec.rb

@@ -1,4 +1,8 @@
+require_relative 'ovirt_refresher_spec_common'
+
 describe ManageIQ::Providers::Redhat::InfraManager::Refresh::Refresher do
+  include OvirtRefresherSpecCommon
+
   describe ManageIQ::Providers::Redhat::InfraManager::Refresh::Refresher do
     before(:each) do
       _guid, _server, zone = EvmSpecHelper.create_guid_miq_server_zone
@@ -26,8 +30,6 @@
       stub_const("OvirtSDK4::Connection", Spec::Support::OvirtSDK::ConnectionVCR)
     end
 
-    COUNTED_MODELS = [CustomAttribute, EmsFolder, EmsCluster, Datacenter].freeze
-
     before(:each) do
       @inventory_wrapper_class = ManageIQ::Providers::Redhat::InfraManager::Inventory::Strategies::V4
 
@@ -42,29 +44,29 @@ def load_response_mock_for(filename)
       YAML.load_file(File.join('spec', 'models', prefix, 'response_yamls', filename + '.yml'))
     end
 
+    let(:models_for_host_target) { [ExtManagementSystem, EmsFolder, EmsCluster, Storage, HostStorage, Switch, HostSwitch, Lan, CustomAttribute] }
+
     it 'does not change the host when target refresh after full refresh' do
       stub_settings_merge(:ems_refresh => { :rhevm => {:inventory_object_refresh => true }})
+
       EmsRefresh.refresh(@ems)
       @ems.reload
+
+      saved_inventory = serialize_inventory(models_for_host_target)
+
       host = @ems.hosts.find_by(:ems_ref => "/api/hosts/f9dbfd16-3c79-4028-9304-9acf3b8857ba")
-      saved_host = host_to_comparable_hash(host)
-      saved_counted_models = COUNTED_MODELS.map { |m| [m.name, m.count] }
-      saved_switches = host.switches.map { |switch| [switch.uid_ems, switch.name] }
-      expect(host.networks.count).to eq(2)
       EmsRefresh.refresh(host)
       host.reload
-      expect(host.networks.count).to eq(2)
-      expect(saved_switches).to contain_exactly(*host.switches.map { |switch| a_collection_containing_exactly(switch.uid_ems, switch.name) })
+
+      expect(serialize_inventory(models_for_host_target)).to eq(saved_inventory)
+
       EmsRefresh.refresh(host)
       host.reload
+
       expect(host.switches.map { |switch| [switch.uid_ems, switch.name] }).to contain_exactly(
         a_collection_containing_exactly("00000000-0000-0000-0000-000000000009", "ovirtmgmt"),
         a_collection_containing_exactly("5c42817f-03fb-460e-a3ab-a8770553aeee", "vlan123t")
       )
-      expect(host.networks.count).to eq(2)
-      counted_models = COUNTED_MODELS.map { |m| [m.name, m.count] }
-      expect(saved_host).to eq(host_to_comparable_hash(host))
-      expect(saved_counted_models).to eq(counted_models)
     end
 
     def host_to_comparable_hash(host)