Merge pull request ManageIQ#149 from smelamud/vm-import-wait-for-vm

v2v: Handle IMPORTEXPORT_STARTING_IMPORT_VM event
tinaafitz · Jul 28, 2017 · 2e4892c · 2e4892c
2 parents 80668f0 + 5b48571
commit 2e4892c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/...nfrastructure/VM/Transform/StateMachines/VmImport.class/__methods__/wait_for_vm_import.rb b/...nfrastructure/VM/Transform/StateMachines/VmImport.class/__methods__/wait_for_vm_import.rb
@@ -33,7 +33,7 @@ def main
 
               def set_retry
                 @handle.root['ae_result'] = 'retry'
-                @handle.root['ae_retry_interval'] = @handle.inputs['retry_interval'] || 30.minutes
+                @handle.root['ae_retry_interval'] = @handle.inputs['retry_interval'] || 3.minutes
               end
 
               def imported_vm

diff --git a/content/automate/ManageIQ/System/Event/EmsEvent/RHEVM.class/importexport_import_vm.yaml b/content/automate/ManageIQ/System/Event/EmsEvent/RHEVM.class/importexport_import_vm.yaml
@@ -9,6 +9,6 @@ object:
     description: 
   fields:
   - rel4:
-      value: "/System/event_handlers/event_action_refresh?target=src_vm"
+      value: "/System/event_handlers/event_action_refresh_new_target?target=src_vm"
   - meth4:
       value: update_vm_import_status
diff --git a/...nt/automate/ManageIQ/System/Event/EmsEvent/RHEVM.class/importexport_import_vm_failed.yaml b/...nt/automate/ManageIQ/System/Event/EmsEvent/RHEVM.class/importexport_import_vm_failed.yaml
@@ -10,3 +10,5 @@ object:
   fields:
   - meth4:
       value: update_vm_import_status
+  - rel5:
+      value: "/System/event_handlers/event_action_refresh?target=src_vm"
diff --git a/.../automate/ManageIQ/System/Event/EmsEvent/RHEVM.class/importexport_starting_import_vm.yaml b/.../automate/ManageIQ/System/Event/EmsEvent/RHEVM.class/importexport_starting_import_vm.yaml
@@ -0,0 +1,12 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: IMPORTEXPORT_STARTING_IMPORT_VM
+    inherits: 
+    description: 
+  fields:
+  - rel5:
+      value: "/System/event_handlers/event_action_refresh_new_target?target=src_vm"
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,5 @@ object: @@
       fields:
       - meth4:
           value: update_vm_import_status
+      - rel5:
+          value: "/System/event_handlers/event_action_refresh?target=src_vm"