Merge pull request #382 from fdupont-redhat/v2v_fix_cleanup_state_mac…

…hine_poweron

Fix default cleanup state machine

content/automate/ManageIQ/System/CommonMethods/MiqAe.class/__methods__/weightedupdatestatus.rb

@@ -38,6 +38,7 @@ def create_cleanup_request(task)
                 options[:class_name] = sm_uri_array.pop
                 options[:namespace] = sm_uri_array.join('/')
                 options[:user_id] = @handle.root['user_id']
+                options[:attrs] = { :service_template_transformation_plan_task_id => task.id }
                 request = @handle.execute("create_automation_request", options, @handle.root['user'].userid, true)
                 task.set_option(:cleanup_request_id, request.id) unless request.nil?
               end

content/automate/ManageIQ/Transformation/Infrastructure/VM/Common.class/__methods__/checkpoweredon.rb

@@ -0,0 +1,41 @@
+module ManageIQ
+  module Automate
+    module Transformation
+      module Infrastructure
+        module VM
+          module Common
+            class CheckPoweredOn
+              def initialize(handle = $evm)
+                @handle = handle
+              end
+
+              def main
+                if @handle.root['service_template_transformation_plan_task'].blank?
+                  task = @handle.vmdb(:service_template_transformation_plan_task).find_by(:id => @handle.root['service_template_transformation_plan_task_id'])
+                  vm = task.source if task.present?
+                else
+                  task = @handle.root['service_template_transformation_plan_task']
+                  vm = @handle.vmdb(:vm).find_by(:id => task.get_option(:destination_vm_id)) if task.present?
+                end
+                return if vm.blank?
+                @handle.log(:info, "Target VM: #{vm.name} [#{vm.vendor}]")
+                return if task.get_option(:source_vm_power_state) != 'on'
+                if vm.power_state != 'on'
+                  @handle.root["ae_result"] = "retry"
+                  @handle.root["ae_retry_interval"] = "15.seconds"
+                end
+              rescue => e
+                @handle.set_state_var(:ae_state_progress, 'message' => e.message)
+                raise
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+if $PROGRAM_NAME == __FILE__
+  ManageIQ::Automate::Transformation::Infrastructure::VM::Common::CheckPoweredOn.new.main
+end

content/automate/ManageIQ/Transformation/StateMachines/VMTransformation.class/posttransform.yaml

@@ -25,7 +25,7 @@ object:
       on_error: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 5, description
         => "Power-on VM", task_message => "Migrating")
   - State8:
-      value: "/Transformation/Infrastructure/VM/${state_var#destination_ems_type}/CheckPoweredOn"
+      value: "/Transformation/Infrastructure/VM/Common/CheckPoweredOn"
       on_entry: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 40, description
         => "Power-on VM", task_message => "Migrating")
       on_exit: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 40, description

content/automate/ManageIQ/Transformation/StateMachines/VMTransformation.class/transformationcleanup.yaml

@@ -9,31 +9,23 @@ object:
     description: 
   fields:
   - State2:
-      value: "/Transformation/Common/AssessTransformationCleanup"
-      on_entry: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 10, description
-        => "Assess Migration Cleanup", task_message => "Cleanup")
-      on_exit: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 10, description
-        => "Assess Migration Cleanup", task_message => "Cleanup")
-      on_error: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 10, description
-        => "Assess Migration Cleanup", task_message => "Cleanup")
-  - State5:
       value: "/Transformation/TransformationHosts/Common/KillVirtV2V"
       on_entry: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 40, description
         => "Interrupt virt-v2v", task_message => "Cleanup")
       on_exit: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 40, description
         => "Interrupt virt-v2v", task_message => "Cleanup")
       on_error: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 40, description
         => "Interrupt virt-v2v", task_message => "Cleanup")
-  - State8:
+  - State5:
       value: "/Transformation/Infrastructure/VM/Common/PowerOn"
       on_entry: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 10, description
         => "Power-on VM", task_message => "Cleanup")
       on_exit: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 10, description
         => "Power-on VM", task_message => "Cleanup")
       on_error: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 10, description
         => "Power-on VM", task_message => "Cleanup")
-  - State11:
-      value: "/Transformation/Infrastructure/VM/${state_var#destination_ems_type}/CheckPoweredOn"
+  - State8:
+      value: "/Transformation/Infrastructure/VM/Common/CheckPoweredOn"
       on_entry: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 40, description
         => "Power-on VM", task_message => "Cleanup")
       on_exit: /System/CommonMethods/MiqAe.WeightedUpdateStatus(weight => 40, description