Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save Physical Disks Model #17700

Merged
merged 1 commit into from
Aug 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/models/ems_refresh/save_inventory_physical_infra.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
child_keys = %i(computer_system asset_detail physical_disk)
save_inventory_multi(ems.physical_storages, hashes, deletes, [:ems_ref], child_keys)
store_ids_for_new_records(ems.physical_storages, hashes, :ems_ref)
end
Expand All @@ -114,6 +114,14 @@ def save_asset_detail_inventory(parent, hash)
save_inventory_single(:asset_detail, parent, hash)
end

#
# Saves the drive information of a storage
#
def save_physical_disk_inventory(parent, hash)
return if hash.nil?
save_inventory_single(:physical_disk, parent, hash)
end

def save_physical_network_ports_inventory(guest_device, hashes, target = nil)
return if hashes.nil?

Expand Down
5 changes: 5 additions & 0 deletions app/models/physical_disk.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class PhysicalDisk < ApplicationRecord
belongs_to :physical_storage, :foreign_key => :physical_storage_id, :inverse_of => :physical_disks

acts_as_miq_taggable
end
2 changes: 2 additions & 0 deletions app/models/physical_storage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ class PhysicalStorage < ApplicationRecord
has_one :asset_detail, :as => :resource, :dependent => :destroy, :inverse_of => false
has_many :guest_devices, :through => :hardware

has_many :physical_disks, :dependent => :destroy, :inverse_of => :physical_storages

def my_zone
ems = ext_management_system
ems ? ems.my_zone : MiqServer.my_zone
Expand Down