Merge pull request #455 from fdupont-redhat/bz1640816

Deny request if no conversion host is configured (cherry picked from commit 4d84575) https://bugzilla.redhat.com/show_bug.cgi?id=1640816
ManageIQ · Nov 5, 2018 · 82ef82a · 82ef82a
1 parent 6286a71
commit 82ef82a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/...ageIQ/Transformation/StateMachines/TransformationPlanRequestApproval.class/__class__.yaml b/...ageIQ/Transformation/StateMachines/TransformationPlanRequestApproval.class/__class__.yaml
@@ -48,7 +48,7 @@ object:
       condition: 
       on_entry: validate_request
       on_exit: 
-      on_error: pending_request
+      on_error: deny_request
       max_retries: '100'
       max_time: 
   - field:
@@ -68,6 +68,6 @@ object:
       condition: 
       on_entry: approve_request
       on_exit: 
-      on_error: pending_request
+      on_error: deny_request
       max_retries: '100'
       max_time: 
diff --git a/...rmation/StateMachines/TransformationPlanRequestApproval.class/__methods__/deny_request.rb b/...rmation/StateMachines/TransformationPlanRequestApproval.class/__methods__/deny_request.rb
@@ -0,0 +1,5 @@
+request = $evm.root['miq_request']
+message = $evm.object['reason']
+$evm.log('info', "Request denied because of #{message}")
+request.message = message
+request.deny('admin', msg = message)
diff --git a/...al.class/__methods__/pending_request.yaml → ...roval.class/__methods__/deny_request.yaml b/...al.class/__methods__/pending_request.yaml → ...roval.class/__methods__/deny_request.yaml
diff --git a/...tion/StateMachines/TransformationPlanRequestApproval.class/__methods__/pending_request.rb b/...tion/StateMachines/TransformationPlanRequestApproval.class/__methods__/pending_request.rb
diff --git a/...ion/StateMachines/TransformationPlanRequestApproval.class/__methods__/validate_request.rb b/...ion/StateMachines/TransformationPlanRequestApproval.class/__methods__/validate_request.rb
@@ -1,5 +1,9 @@
-#
-# Description: Placeholder for service request validation
-#
-prov = $evm.root['miq_request']
-prov.source_vms.each { |vm| prov.approve_vm(vm) if prov.validate_vm(vm) }
+request = $evm.root['miq_request']
+
+unless request.validate_conversion_hosts
+  $evm.object['reason'] = 'No conversion host configured'
+  request.message = 'No conversion host configured'
+  exit MIQ_ABORT
+end
+
+request.source_vms.each { |vm| request.approve_vm(vm) if request.validate_vm(vm) }