Update model to use the customization_scripts table for LXCA config patterns #16036
Conversation
|
Schema changes are in ManageIQ/manageiq-schema#75 |
|
@miq-bot assign @blomquisg |
app/models/customization_script.rb
Outdated
| @@ -3,4 +3,5 @@ class CustomizationScript < ApplicationRecord | |||
|
|
|||
| acts_as_miq_taggable | |||
| belongs_to :provisioning_manager | |||
There was a problem hiding this comment.
Ah, this line will have to be removed with the next line added. It might break some tests that have to be cleaned up. But, the provisioning_manager and the ext_mangement_system are actually really the same thing (both pointing to ext_management_systems table).
| @@ -52,18 +52,18 @@ def save_physical_servers_inventory(ems, hashes, target = nil) | |||
| store_ids_for_new_records(ems.physical_servers, hashes, :ems_ref) | |||
| end | |||
|
|
|||
| def save_configuration_templates_inventory(ems, hashes, target = nil) | |||
| def save_customization_scripts(ems, hashes, target = nil) | |||
There was a problem hiding this comment.
This method should have _inventory on the end. Otherwise I don't think it will be called.
|
@blomquisg I've made the changes you recommended, and the tests are still failing. I think it's because the schema changes haven't been merged yet. |
|
@bdunne Please review. |
app/models/customization_script.rb
Outdated
| @@ -2,5 +2,5 @@ class CustomizationScript < ApplicationRecord | |||
| include NewWithTypeStiMixin | |||
|
|
|||
| acts_as_miq_taggable | |||
| belongs_to :provisioning_manager | |||
| belongs_to :ext_management_system, :foreign_key => "manager_id" | |||
There was a problem hiding this comment.
Can this (and the corresponding migration) be split into separate PRs? They're not really related to the rest of the changes here.
Also, would you mind deprecating the old belongs_to with:
deprecate_belongs_to(:provisioning_manager, :ext_management_system)There was a problem hiding this comment.
@bdunne I tested this change, and it looks like the deprecate is causing a problem. I am getting the following error in the UI:
undefined method `deprecate_belongs_to' for #Class:0x007f3ac1a98ff0 Did you mean? deprecate_constant [ems_physical_infra/show_list]
There was a problem hiding this comment.
Oh you'll also need to include DeprecationMixin in this class in order to use deprecate_belongs_to
| @@ -59,7 +59,7 @@ def self.supported_types_and_descriptions_hash | |||
| has_many :customization_specs, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
| has_many :storage_profiles, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
| has_many :physical_servers, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
| has_many :configuration_templates, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
| has_many :customization_scripts, :foreign_key => "manager_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
There was a problem hiding this comment.
@bdunne Is it safe to leave this here? Or should it also be moved to the other PR since it uses the renamed "manager_id" field?
|
Checked commits skovic/manageiq@5a27d67~...dda559a with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
|
@bdunne Looks like the travis tests are failing now because of the changes we moved out of this PR. |
| @@ -59,7 +59,7 @@ def self.supported_types_and_descriptions_hash | |||
| has_many :customization_specs, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
| has_many :storage_profiles, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
| has_many :physical_servers, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
| has_many :configuration_templates, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
| has_many :customization_scripts, :foreign_key => "manager_id", :dependent => :destroy, :inverse_of => :ext_management_system | |||
Recently, a new table named configuration_templates was created to hold data related to configuration patterns. Based on feedback received from Red Hat, this PR updates the model to use an existing table, customization_scripts, to hold configuration pattern data instead.