Skip to content

Commit 462fbae

Browse files
committed
Add a common ServiceTemplateAutomation parent class
Add a common parent class that Awx/AnsibleTower/TerraformEnterprise can inherit from.
1 parent 4d8325d commit 462fbae

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

app/models/service_template_ansible_tower.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
class ServiceTemplateAnsibleTower < ServiceTemplate
1+
class ServiceTemplateAnsibleTower < ServiceTemplateAutomation
22
include ServiceConfigurationMixin
3-
include ServiceTemplateAutomationMixin
43

54
before_update :remove_invalid_resource
65

@@ -31,11 +30,6 @@ def remove_invalid_resource
3130
end
3231
end
3332

34-
def create_subtasks(_parent_service_task, _parent_service)
35-
# no sub task is needed for this service
36-
[]
37-
end
38-
3933
def self.default_provisioning_entry_point(_service_type)
4034
'/AutomationManagement/AnsibleTower/Service/Provisioning/StateMachines/Provision/CatalogItemInitialization'
4135
end
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
class ServiceTemplateAutomation < ServiceTemplate
2+
include ServiceTemplateAutomationMixin
3+
4+
def create_subtasks(_parent_service_task, _parent_service)
5+
if generic?
6+
# no sub task is needed for this service
7+
[]
8+
else
9+
super
10+
end
11+
end
12+
13+
def generic?
14+
prov_type.start_with?("generic_")
15+
end
16+
end

app/models/service_template_awx.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
class ServiceTemplateAwx < ServiceTemplate
1+
class ServiceTemplateAwx < ServiceTemplateAutomation
22
include ServiceConfigurationMixin
3-
include ServiceTemplateAutomationMixin
43

54
before_update :remove_invalid_resource
65

@@ -31,11 +30,6 @@ def remove_invalid_resource
3130
end
3231
end
3332

34-
def create_subtasks(_parent_service_task, _parent_service)
35-
# no sub task is needed for this service
36-
[]
37-
end
38-
3933
def self.default_provisioning_entry_point(_service_type)
4034
'/AutomationManagement/AnsibleTower/Service/Provisioning/StateMachines/Provision/CatalogItemInitialization'
4135
end

0 commit comments

Comments
 (0)