From 42687860cb869703bb464640c722fcac06a0ce10 Mon Sep 17 00:00:00 2001 From: Richard Oliveri Date: Thu, 29 Nov 2018 09:58:03 -0500 Subject: [PATCH] Merge pull request #18181 from AparnaKarve/bz1639239_report_status_on_inactive_vm Report accurate status on inactive VM (cherry picked from commit 76df3dba524c59b7ab6a257dbb2770cffafe9aca) https://bugzilla.redhat.com/show_bug.cgi?id=1639239 --- .../transformation_mapping/vm_migration_validator.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/transformation_mapping/vm_migration_validator.rb b/app/models/transformation_mapping/vm_migration_validator.rb index c1d80d58877..777bfa8abc1 100644 --- a/app/models/transformation_mapping/vm_migration_validator.rb +++ b/app/models/transformation_mapping/vm_migration_validator.rb @@ -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'] @@ -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? @@ -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