Merge pull request ManageIQ#17616 from EsdrasVP/add_storage_to_chassis

Adding PhysicalStorage into PhysicalChassis
agrare · Jul 17, 2018 · ed7477c · ed7477c
2 parents c79e9db + b01d027
commit ed7477c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/app/models/ems_refresh/save_inventory_physical_infra.rb b/app/models/ems_refresh/save_inventory_physical_infra.rb
@@ -98,6 +98,7 @@ def save_physical_storages_inventory(ems, hashes, target = nil)
 
     hashes.each do |h|
       h[:physical_rack_id] = h.delete(:physical_rack).try(:[], :id)
+      h[:physical_chassis_id] = h.delete(:physical_chassis).try(:[], :id)
     end
 
     child_keys = %i(computer_system asset_detail)

diff --git a/app/models/physical_chassis.rb b/app/models/physical_chassis.rb
@@ -6,6 +6,7 @@ class PhysicalChassis < ApplicationRecord
   belongs_to :physical_rack, :foreign_key => :physical_rack_id, :inverse_of => :physical_chassis
 
   has_many :physical_servers, :dependent => :destroy, :inverse_of => :physical_chassis
+  has_many :physical_storages, :dependent => :destroy, :inverse_of => :physical_chassis
 
   has_one :computer_system, :as => :managed_entity, :dependent => :destroy, :inverse_of => false
   has_one :hardware, :through => :computer_system

diff --git a/app/models/physical_rack.rb b/app/models/physical_rack.rb
@@ -3,9 +3,9 @@ class PhysicalRack < ApplicationRecord
 
   belongs_to :ext_management_system, :foreign_key => :ems_id, :inverse_of => :physical_racks,
     :class_name => "ManageIQ::Providers::PhysicalInfraManager"
-
   has_many :physical_chassis, :dependent => :nullify, :inverse_of => :physical_rack
   has_many :physical_servers, :dependent => :nullify, :inverse_of => :physical_rack
+  has_many :physical_storages, :dependent => :nullify, :inverse_of => :physical_rack
 
   def my_zone
     ems = ext_management_system

diff --git a/app/models/physical_storage.rb b/app/models/physical_storage.rb
@@ -1,8 +1,8 @@
 class PhysicalStorage < ApplicationRecord
   belongs_to :ext_management_system, :foreign_key => :ems_id, :inverse_of => :physical_storages,
    :class_name => "ManageIQ::Providers::PhysicalInfraManager"
-
   belongs_to :physical_rack, :foreign_key => :physical_rack_id, :inverse_of => :physical_storages
+  belongs_to :physical_chassis, :inverse_of => :physical_storages
 
   has_one :computer_system, :as => :managed_entity, :dependent => :destroy, :inverse_of => false
   has_one :hardware, :through => :computer_system