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

Fix Physical Disks save inventory #17972

Merged
merged 1 commit into from
Sep 18, 2018
Merged
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
16 changes: 11 additions & 5 deletions 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 physical_disk canister)
child_keys = %i(computer_system asset_detail physical_disks 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
Expand All @@ -115,11 +115,17 @@ def save_asset_detail_inventory(parent, hash)
end

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

# Update the associated ids
hashes.each do |h|
h[:physical_storage_id] = h.delete(:physical_storage).try(:[], :id)
end

save_inventory_multi(physical_storage.physical_disks, hashes, :use_association, [:physical_storage_id])
end

#
Expand Down