Fixing Computer System association on Physical Storage

ManageIQ · Sep 5, 2018 · c4e15d9 · c4e15d9
1 parent bb7d748
commit c4e15d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/models/ems_refresh/save_inventory_physical_infra.rb b/app/models/ems_refresh/save_inventory_physical_infra.rb
@@ -101,7 +101,7 @@ def save_physical_storages_inventory(ems, hashes, target = nil)
       h[:physical_chassis_id] = h.delete(:physical_chassis).try(:[], :id)
     end
 
-    child_keys = %i(computer_system asset_detail physical_disk canister)
+    child_keys = %i(asset_detail physical_disk canister)
     save_inventory_multi(ems.physical_storages, hashes, deletes, [:ems_ref], child_keys)
     store_ids_for_new_records(ems.physical_storages, hashes, :ems_ref)
   end

diff --git a/app/models/physical_storage.rb b/app/models/physical_storage.rb
@@ -9,11 +9,11 @@ class PhysicalStorage < ApplicationRecord
   has_one :asset_detail, :as => :resource, :dependent => :destroy, :inverse_of => false
 
   has_many :canisters, :dependent => :destroy, :inverse_of => false
-  has_many :computer_system, :through => :canisters
-  has_many :hardware, :through => :computer_system
-  has_many :guest_devices, :through => :canisters
-
   has_many :physical_disks, :dependent => :destroy, :inverse_of => :physical_storage
+
+  has_one :computer_system, :through => :canisters
+
+  has_many :canister_computer_systems, :through => :canisters, :source => :computer_system
 
   supports :refresh_ems