Refactor methods.

content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/__methods__/check_completed.rb

@@ -14,21 +14,30 @@ def initialize(handle = $evm)
 
               def main
                 @handle.log("info", "Starting check_completed")
-
-                task = @handle.root["service_template_provision_task"]
-                service = task.try(:destination)
-
-                unless service
-                  @handle.log(:error, 'Service is nil')
-                  raise 'Service is nil'
-                end
-
                 check_completed(service)
                 @handle.log("info", "Ending check_completed")
               end
 
               private
 
+              def task
+                @handle.root["service_template_provision_task"].tap do |task|
+                  if task.nil?
+                    @handle.log(:error, 'service_template_provision_task is nil')
+                    raise "service_template_provision_task not found"
+                  end
+                end
+              end
+
+              def service
+                task.destination.tap do |service|
+                  if service.nil?
+                    @handle.log(:error, 'Service is nil')
+                    raise 'Service not found'
+                  end
+                end
+              end
+
               def check_completed(service)
                 done, message = service.check_completed(@handle.root["service_action"])
                 if done

content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/__methods__/check_refreshed.rb

@@ -13,21 +13,31 @@ def initialize(handle = $evm)
               end
 
               def main
-                task = @handle.root["service_template_provision_task"]
-                service = task.try(:destination)
-
-                unless service
-                  @handle.log(:error, 'Service is nil')
-                  raise 'Service is nil'
-                end
-
                 @handle.log("info", "Starting Check Refreshed")
                 check_refreshed(service)
                 @handle.log("info", "Ending Check Refreshed")
               end
 
               private
 
+              def task
+                @handle.root["service_template_provision_task"].tap do |task|
+                  if task.nil?
+                    @handle.log(:error, 'service_template_provision_task is nil')
+                    raise "service_template_provision_task not found"
+                  end
+                end
+              end
+
+              def service
+                task.destination.tap do |service|
+                  if service.nil?
+                    @handle.log(:error, 'Service is nil')
+                    raise 'Service not found'
+                  end
+                end
+              end
+
               def check_refreshed(service)
                 done, message = service.check_refreshed(@handle.root['service_action'])
                 if done

content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/__methods__/execute.rb

@@ -15,9 +15,6 @@ def initialize(handle = $evm)
               def main
                 @handle.log("info", "Starting execute")
 
-                task = @handle.root["service_template_provision_task"]
-                service = task.destination
-
                 begin
                   service.execute(@handle.root["service_action"])
                   @handle.log("info", "Ending execute")
@@ -28,6 +25,26 @@ def main
                   @handle.log("info", "Error in execute")
                 end
               end
+
+              private
+
+              def task
+                @handle.root["service_template_provision_task"].tap do |task|
+                  if task.nil?
+                    @handle.log(:error, 'service_template_provision_task is nil')
+                    raise "service_template_provision_task not found"
+                  end
+                end
+              end
+
+              def service
+                task.destination.tap do |service|
+                  if service.nil?
+                    @handle.log(:error, 'Service is nil')
+                    raise 'Service not found'
+                  end
+                end
+              end
             end
           end
         end

content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/__methods__/postprocess.rb

@@ -14,13 +14,29 @@ def initialize(handle = $evm)
 
               def main
                 @handle.log("info", "Starting PostProcessing")
-
-                task = @handle.root["service_template_provision_task"]
-                service = task.destination
-
                 service.postprocess(@handle.root["service_action"])
                 @handle.log("info", "Ending PostProcessing")
               end
+
+              private
+
+              def task
+                @handle.root["service_template_provision_task"].tap do |task|
+                  if task.nil?
+                    @handle.log(:error, 'service_template_provision_task is nil')
+                    raise "service_template_provision_task not found"
+                  end
+                end
+              end
+
+              def service
+                task.destination.tap do |service|
+                  if service.nil?
+                    @handle.log(:error, 'Service is nil')
+                    raise 'Service not found'
+                  end
+                end
+              end
             end
           end
         end

content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/__methods__/preprocess.rb

@@ -13,20 +13,37 @@ def initialize(handle = $evm)
 
               def main
                 @handle.log("info", "Starting preprocess")
+                dump_root
+                options = {}
+                # user can insert options to override options from dialog
+                service.preprocess(@handle.root["service_action"], options)
+              end
+
+              private
 
+              def dump_root
                 @handle.log("info", "Root:<$evm.root> Attributes - Begin")
                 @handle.root.attributes.sort.each { |k, v| $evm.log("info", "  Attribute - #{k}: #{v}") }
                 @handle.log("info", "Root:<$evm.root> Attributes - End")
                 @handle.log("info", "")
+              end
+
+              def task
+                @handle.root["service_template_provision_task"].tap do |task|
+                  if task.nil?
+                    @handle.log(:error, 'service_template_provision_task is nil')
+                    raise "service_template_provision_task not found"
+                  end
+                end
+              end
 
-                service = @handle.root["service_template_provision_task"].try(:destination)
-                unless service
-                  @handle.log(:error, 'Service is nil')
-                  raise 'Service is nil'
+              def service
+                task.destination.tap do |service|
+                  if service.nil?
+                    @handle.log(:error, 'Service is nil')
+                    raise 'Service not found'
+                  end
                 end
-                options = {}
-                # user can insert options to override options from dialog
-                service.preprocess(@handle.root["service_action"], options)
               end
             end
           end

content/automate/ManageIQ/Service/Generic/StateMachines/GenericLifecycle.class/__methods__/refresh.rb

@@ -13,18 +13,30 @@ def initialize(handle = $evm)
               end
 
               def main
-                task = @handle.root["service_template_provision_task"]
-                service = task.try(:destination)
-
-                unless service
-                  @handle.log(:error, 'Service is nil')
-                  raise 'Service is nil'
-                end
-
                 @handle.log("info", "Starting Refresh")
                 service.refresh(@handle.root["service_action"])
                 @handle.log("info", "Ending Refresh")
               end
+
+              private
+
+              def task
+                @handle.root["service_template_provision_task"].tap do |task|
+                  if task.nil?
+                    @handle.log(:error, 'service_template_provision_task is nil')
+                    raise "service_template_provision_task not found"
+                  end
+                end
+              end
+
+              def service
+                task.destination.tap do |service|
+                  if service.nil?
+                    @handle.log(:error, 'Service is nil')
+                    raise 'Service not found'
+                  end
+                end
+              end
             end
           end
         end