Merge pull request #18053 from EsdrasVP/add_physical_disks_to_canisters

Add PhysicalDisks into Canisters

app/models/canister.rb

@@ -4,6 +4,7 @@ class Canister < ApplicationRecord
   has_one :computer_system, :as => :managed_entity, :dependent => :destroy, :inverse_of => false
   has_one :hardware, :through => :computer_system
 
+  has_many :physical_disks, :dependent => :destroy, :inverse_of => :canister
   has_many :guest_devices, :through => :hardware
   has_many :physical_network_ports, :through => :guest_devices
 

app/models/ems_refresh/save_inventory_physical_infra.rb

@@ -122,10 +122,10 @@ def save_physical_disks_inventory(physical_storage, hashes)
 
     # Update the associated ids
     hashes.each do |h|
-      h[:physical_storage_id] = h.delete(:physical_storage).try(:[], :id)
+      h[:canister_id] = h.delete(:canister).try(:[], :id)
     end
 
-    save_inventory_multi(physical_storage.physical_disks, hashes, :use_association, [:physical_storage_id])
+    save_inventory_multi(physical_storage.physical_disks, hashes, :use_association, [:ems_ref])
   end
 
   #

app/models/physical_disk.rb

@@ -1,5 +1,6 @@
 class PhysicalDisk < ApplicationRecord
   belongs_to :physical_storage, :foreign_key => :physical_storage_id, :inverse_of => :physical_disks
+  belongs_to :canister, :foreign_key => :canister_id, :inverse_of => :physical_disks
 
   acts_as_miq_taggable
 end

locale/en.yml

@@ -868,6 +868,7 @@ en:
       ManageIQ::Providers::Lenovo::PhysicalInfraManager::PhysicalRack:      Physical Rack (Lenovo)
       ManageIQ::Providers::Lenovo::PhysicalInfraManager::PhysicalChassis:   Physical Chassis (Lenovo)
       ManageIQ::Providers::Lenovo::PhysicalInfraManager::PhysicalServer:    Physical Server (Lenovo)
+      ManageIQ::Providers::Lenovo::PhysicalInfraManager::PhysicalStorage:    Physical Storage (Lenovo)
       ManageIQ::Providers::Lenovo::PhysicalInfraManager::PhysicalSwitch:    Physical Switch (Lenovo)
       ManageIQ::Providers::Redfish::PhysicalInfraManager::PhysicalServer:   Physical Server (Redfish)
       MeteringContainerImage:   Metering for Image