Merge pull request #915 from kbrock/unsupported_reason_return

remove return from supports blocks
ManageIQ · Jul 2, 2024 · 6b391ab · 6b391ab
2 parents 5c67447 + 2855abb
commit 6b391ab
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/app/models/manageiq/providers/vmware/infra_manager/vm/operations/guest.rb b/app/models/manageiq/providers/vmware/infra_manager/vm/operations/guest.rb
@@ -3,28 +3,22 @@ module ManageIQ::Providers::Vmware::InfraManager::Vm::Operations::Guest
 
   included do
     supports :reboot_guest do
-      reason = unsupported_reason(:control)
-      return reason if reason
-
-      if current_state == "on"
-        if tools_status == 'toolsNotInstalled'
-          _("The VM tools is not installed")
-        end
-      else
+      if current_state != "on"
         _("The VM is not powered on")
+      elsif tools_status == 'toolsNotInstalled'
+        _("The VM tools is not installed")
+      else
+        unsupported_reason(:control)
       end
     end
 
     supports :shutdown_guest do
-      reason = unsupported_reason(:control)
-      return reason if reason
-
-      if current_state == "on"
-        if tools_status == 'toolsNotInstalled'
-          _("The VM tools is not installed")
-        end
-      else
+      if current_state != "on"
         _("The VM is not powered on")
+      elsif tools_status == 'toolsNotInstalled'
+        _("The VM tools is not installed")
+      else
+        unsupported_reason(:control)
       end
     end