Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 1 deletion app/models/service_template_awx.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ def self.validate_config_info(options)
end

def my_zone
zone&.name || job_template.manager.try(:my_zone)
# Determine the zone from either the Service directly, a ConfigurationScript in the service_resources (deprecated type),
# or a MiqRequest in the service_resources.
zone&.name ||
job_template&.manager.try(:my_zone) ||
service_resources.find_by(:resource_type => 'MiqRequest')&.resource&.my_zone
end

private
Expand Down
47 changes: 47 additions & 0 deletions spec/models/service_template_ansible_tower_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,52 @@
expect(service_template.my_zone).to eq(nil)
end
end

context 'with an explicit zone set on the service template' do
let!(:server_zone) { EvmSpecHelper.local_miq_server.zone }
let(:explicit_zone) { FactoryBot.create(:zone, :name => 'explicit_zone') }
let(:service_template_with_zone) { FactoryBot.create(:service_template_ansible_tower, :zone => explicit_zone) }

it 'returns the explicit zone even when it differs from MiqServer.my_zone' do
expect(service_template_with_zone.my_zone).to eq(explicit_zone.name)
expect(explicit_zone.name).not_to eq(server_zone.name)
end
end

context 'with no zone, no job_template, and no MiqRequest in service_resources' do
it 'returns nil' do
service_template = FactoryBot.create(:service_template_ansible_tower)
expect(service_template.my_zone).to be_nil
end
end

context 'with a MiqRequest in service_resources' do
let!(:zone) { EvmSpecHelper.local_miq_server.zone }
let(:miq_request) { FactoryBot.create(:automation_request) }
let(:service_template_no_job_template) { FactoryBot.create(:service_template_ansible_tower) }

before do
service_template_no_job_template.service_resources.create!(:resource => miq_request)
end

it 'takes the zone from the MiqRequest' do
expect(service_template_no_job_template.my_zone).to eq(zone.name)
end
end

context 'with a MiqRequest in service_resources and a job template without a manager' do
let!(:zone) { EvmSpecHelper.local_miq_server.zone }
let(:job_template_no_manager) { FactoryBot.create(:configuration_script, :manager => nil) }
let(:service_template_no_manager) { FactoryBot.create(:service_template_ansible_tower, :job_template => job_template_no_manager) }
let(:miq_request) { FactoryBot.create(:automation_request) }

before do
service_template_no_manager.service_resources.create!(:resource => miq_request)
end

it 'falls back to the MiqRequest zone when job_template manager is absent' do
expect(service_template_no_manager.my_zone).to eq(zone.name)
end
end
end
end