-
Notifications
You must be signed in to change notification settings - Fork 898
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.
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
Add a validation for conversion hosts #18135
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,16 @@ def source_vms | |
vm_resources.where(:status => [ServiceResource::STATUS_QUEUED, ServiceResource::STATUS_FAILED]).pluck(:resource_id) | ||
end | ||
|
||
def validate_conversion_hosts | ||
transformation_mapping.transformation_mapping_items.each do |item| | ||
next unless %w(EmsCluster CloudTenant).include?(item.source_type) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can do |
||
ems = item.destination_type.constantize.find(item.destination_id).ext_management_system | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This can just be |
||
conversion_hosts = ConversionHost.all.select { |ch| ch.ext_management_system == ems } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hm this is unfortunate, something like There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it'd be better to add associations to ext_management_system like:
|
||
return false if conversion_hosts.empty? | ||
end | ||
true | ||
end | ||
|
||
def validate_vm(_vm_id) | ||
# TODO: enhance the logic to determine whether this VM can be included in this request | ||
true | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,32 @@ | |
ServiceResource.new(:resource => vm, :status => status) | ||
end | ||
end | ||
|
||
let(:dst_ems) { FactoryGirl.create(:ext_management_system) } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any reason not to move these There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
let(:src_cluster) { FactoryGirl.create(:ems_cluster) } | ||
let(:dst_cluster) { FactoryGirl.create(:ems_cluster, :ext_management_system => dst_ems) } | ||
|
||
let(:mapping) do | ||
FactoryGirl.create( | ||
:transformation_mapping, | ||
:transformation_mapping_items => [TransformationMappingItem.new(:source => src_cluster, :destination => dst_cluster)] | ||
) | ||
end | ||
|
||
let(:catalog_item_options) do | ||
{ | ||
:name => 'Transformation Plan', | ||
:description => 'a description', | ||
:config_info => { | ||
:transformation_mapping_id => mapping.id, | ||
:actions => [ | ||
{:vm_id => vms.first.id.to_s, :pre_service => false, :post_service => false}, | ||
{:vm_id => vms.last.id.to_s, :pre_service => false, :post_service => false}, | ||
], | ||
} | ||
} | ||
end | ||
|
||
let(:plan) { FactoryGirl.create(:service_template_transformation_plan, :service_resources => vm_requests) } | ||
let(:request) { FactoryGirl.create(:service_template_transformation_plan_request, :source => plan) } | ||
|
||
|
@@ -28,6 +54,25 @@ | |
end | ||
end | ||
|
||
describe '#validate_conversion_hosts' do | ||
let(:plan) { ServiceTemplateTransformationPlan.create_catalog_item(catalog_item_options) } | ||
let(:request) { FactoryGirl.create(:service_template_transformation_plan_request, :source => plan) } | ||
|
||
context 'no conversion host exists in EMS' do | ||
let(:host) { FactoryGirl.create(:host, :ext_management_system => FactoryGirl.create(:ext_management_system, :zone => FactoryGirl.create(:zone))) } | ||
let(:conversion_host) { FactoryGirl.create(:conversion_host, :resource => host) } | ||
|
||
it { expect(request.validate_conversion_hosts).to eq(false) } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
end | ||
|
||
context 'conversion host exists in EMS' do | ||
let(:host) { FactoryGirl.create(:host, :ext_management_system => dst_ems) } | ||
let(:conversion_host) { FactoryGirl.create(:conversion_host, :resource => host) } | ||
|
||
it { expect(request.validate_conversion_hosts).to eq(false) } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
end | ||
end | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you add a test for using There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
|
||
describe '#validate_vm' do | ||
it { expect(request.validate_vm(vms[0].id)).to be_truthy } | ||
end | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will
valid_conversion_hosts?
be a more obvious method name?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Name already validated in ManageIQ/manageiq-automation_engine#263. It would mean changing it again.