Skip to content

Commit

Permalink
Merge pull request #18181 from AparnaKarve/bz1639239_report_status_on…
Browse files Browse the repository at this point in the history
…_inactive_vm

Report accurate status on inactive VM

(cherry picked from commit 76df3db)

https://bugzilla.redhat.com/show_bug.cgi?id=1639239
  • Loading branch information
roliveri authored and simaishi committed Nov 30, 2018
1 parent 952c1fc commit 4268786
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions app/models/transformation_mapping/vm_migration_validator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def identify_vms
conflict_list = []

vm_names = @vm_list.collect { |row| row['name'] }
vm_objects = Vm.where(:name => vm_names, :ems_cluster => mapped_clusters).includes(:lans, :storages, :host, :ext_management_system)
vm_objects = Vm.where(:name => vm_names).includes(:ems_cluster, :lans, :storages, :host, :ext_management_system)

@vm_list.each do |row|
vm_name = row['name']
Expand All @@ -47,7 +47,13 @@ def identify_vms
next
end

vms = vm_objects.select { |vm| vm.name == vm_name }
if vm_objects.select { |vm| vm.name == vm_name && !vm.active? }.any?
invalid_list << VmMigrateStruct.new(vm_name, nil, VM_INVALID, VM_INACTIVE)
next
end

vms = vm_objects.select { |vm| mapped_clusters.include?(vm.ems_cluster) }
vms = vms.select { |vm| vm.name == vm_name }
vms = vms.select { |vm| vm.uid_ems == row['uid_ems'] } if row['uid_ems'].present?
vms = vms.select { |vm| vm.host.name == row['host'] } if row['host'].present?
vms = vms.select { |vm| vm.ext_management_system.name == row['provider'] } if row['provider'].present?
Expand Down Expand Up @@ -89,8 +95,6 @@ def validate_vm(vm, quick = true)
end

def vm_migration_status(vm)
return VM_INACTIVE unless vm.active?

vm_as_resources = ServiceResource.joins(:service_template).where(:resource => vm, :service_templates => {:type => 'ServiceTemplateTransformationPlan'})

# VM has not been migrated before
Expand Down

0 comments on commit 4268786

Please sign in to comment.