remove configuration_workflow from app/models/manageiq/providers/auto…

…mation_manager
ManageIQ · Jul 26, 2018 · 0262a2d · 0262a2d
1 parent 50a7589
commit 0262a2d
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 16 deletions.
diff --git a/app/models/manageiq/providers/automation_manager.rb b/app/models/manageiq/providers/automation_manager.rb
@@ -11,13 +11,7 @@ class ManageIQ::Providers::AutomationManager < ManageIQ::Providers::BaseManager
 
  has_many :configured_systems, :dependent => :destroy, :foreign_key => "manager_id"
  has_many :configuration_profiles, :dependent => :destroy, :foreign_key => "manager_id"
- has_many :configuration_scripts,
- :dependent => :destroy,
- :foreign_key => "manager_id",
- :class_name => "::ConfigurationScript",
- :inverse_of => :manager
-
- has_many :configuration_workflows, :dependent => :destroy, :foreign_key => "manager_id", :inverse_of => :manager
+ has_many :configuration_scripts, :dependent => :destroy, :foreign_key => "manager_id"
  has_many :credentials, :class_name => "ManageIQ::Providers::AutomationManager::Authentication",
  :as => :resource, :dependent => :destroy
  has_many :inventory_groups, :dependent => :destroy, :foreign_key => "ems_id", :inverse_of => :manager

diff --git a/app/models/manageiq/providers/automation_manager/configuration_workflow.rb b/app/models/manageiq/providers/automation_manager/configuration_workflow.rb
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager.rb
@@ -26,6 +26,8 @@ class ManageIQ::Providers::EmbeddedAnsible::AutomationManager < ManageIQ::Provid
  require_nested :Refresher
  require_nested :RefreshWorker
 
+ has_many :configuration_workflows, :dependent => :destroy, :foreign_key => "manager_id", :inverse_of => :manager
+
  def self.ems_type
  @ems_type ||= "embedded_ansible_automation".freeze
  end

diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_workflow.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_workflow.rb
@@ -1,3 +1,3 @@
-class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::ConfigurationWorkflow < ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationWorkflow
+class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::ConfigurationWorkflow < ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScript
  include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::ConfigurationWorkflow
 end
diff --git a/app/models/manageiq/providers/embedded_automation_manager/configuration_workflow.rb b/app/models/manageiq/providers/embedded_automation_manager/configuration_workflow.rb
diff --git a/app/models/manageiq/providers/external_automation_manager/configuration_workflow.rb b/app/models/manageiq/providers/external_automation_manager/configuration_workflow.rb
diff --git a/spec/factories/configuration_script.rb b/spec/factories/configuration_script.rb
@@ -12,7 +12,7 @@
 
  factory :configuration_script, :class => "ConfigurationScript", :parent => :configuration_script_base
  factory :configuration_workflow,
- :class => "ManageIQ::Providers::AutomationManager::ConfigurationWorkflow",
+ :class => "ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationWorkflow",
  :parent => :configuration_script
  factory :ansible_configuration_script,
  :class => "ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScript",