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.

Sign up for GitHub

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 the ems_custom_attributes inventory collection #21623

Merged
merged 1 commit into from
Dec 16, 2021
Merged

Fix the ems_custom_attributes inventory collection #21623

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions app/models/manageiq/providers/inventory/persister/builder/infra_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def host_operating_systems
def ems_custom_attributes
add_properties(
:model_class => ::CustomAttribute,
:manager_ref => %i(name),
:manager_ref => %i(resource name),
:parent_inventory_collections => %i(vms miq_templates),
)
end
Expand All @@ -84,8 +84,8 @@ def vm_and_template_ems_custom_fields

add_properties(
:model_class => ::CustomAttribute,
:manager_ref => %i(name),
:parent_inventory_collections => %i(vms)
:manager_ref => %i(resource name),
:parent_inventory_collections => %i(vms miq_templates)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This collection (vm_and_template_ems_custom_fields) is used by ovirt and exhibits the same bug, I am going to follow-up with a refactoring to get them both onto the same inventory_collection but want to keep this clean of refactorings for backport

)

add_inventory_attributes(%i(section name value source resource))
Expand Down