Merge pull request #393 from fdupont-redhat/v2v_fix_virtv2v_success_c…

…heck Transformation - Fix virt-v2v success check (cherry picked from commit 6d3d0a3) https://bugzilla.redhat.com/show_bug.cgi?id=1610055
ManageIQ · Aug 6, 2018 · deab314 · deab314
1 parent 3d43a63
commit deab314
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...anageIQ/Transformation/TransformationHosts/Common.class/__methods__/vmchecktransformed.rb b/...anageIQ/Transformation/TransformationHosts/Common.class/__methods__/vmchecktransformed.rb
@@ -50,12 +50,12 @@ def main
                 end
               else
                 task.set_option(:virtv2v_finished_on, Time.now.utc.strftime('%Y%m%d_%H%M'))
-                if virtv2v_state['return_code'].zero?
+                if virtv2v_state['failed']
+                  @handle.set_state_var(:ae_state_progress, 'message' => 'Disks transformation failed.')
+                  raise "Disks transformation failed."
+                else
                   virtv2v_disks.each { |d| d[:percent] = 100 }
                   @handle.set_state_var(:ae_state_progress, 'message' => 'Disks transformation succeeded.', 'percent' => 100)
-                else
-                  @handle.set_state_var(:ae_state_progress, 'message' => 'Disks transformation succeeded.')
-                  raise "Disks transformation failed."
                 end
               end