Skip to content

Add a common ServiceTemplateAutomation parent class #23741

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

Merged
Fryguy merged 1 commit into from
Mar 19, 2026
Merged

Add a common ServiceTemplateAutomation parent class #23741

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions app/models/service_automation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class ServiceAutomation < Service
end
2 changes: 1 addition & 1 deletion app/models/service_awx.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ServiceAwx < Service
class ServiceAwx < ServiceAutomation
include AnsibleExtraVarsMixin
include ServiceConfigurationMixin
include ServiceOrchestrationOptionsMixin
Expand Down
3 changes: 3 additions & 0 deletions app/models/service_template_automation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class ServiceTemplateAutomation < ServiceTemplate
include ServiceTemplateAutomationMixin
end
3 changes: 1 addition & 2 deletions app/models/service_template_awx.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
class ServiceTemplateAwx < ServiceTemplate
class ServiceTemplateAwx < ServiceTemplateAutomation
include ServiceConfigurationMixin
include ServiceTemplateAutomationMixin

before_update :remove_invalid_resource

Expand Down
3 changes: 2 additions & 1 deletion spec/factories/service_template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
factory :service_template do
sequence(:name) { |n| "service_template_#{seq_padded_for_sorting(n)}" }
end
factory :service_template_automation, :class => 'ServiceTemplateAutomation', :parent => :service_template
factory :service_template_orchestration, :class => 'ServiceTemplateOrchestration', :parent => :service_template
factory :service_template_ansible_playbook, :class => 'ServiceTemplateAnsiblePlaybook', :parent => :service_template
factory :service_template_ansible_tower, :class => 'ServiceTemplateAnsibleTower', :parent => :service_template
factory :service_template_ansible_tower, :class => 'ServiceTemplateAnsibleTower', :parent => :service_template_automation
factory :service_template_container_template, :class => 'ServiceTemplateContainerTemplate', :parent => :service_template

trait :with_provision_resource_action_and_dialog do
Expand Down
Loading