Merge remote-tracking branch 'origin/master' into radjabov

Author: Fryguy

.codeclimate.yml

@@ -1,4 +1,3 @@
----
 version: '2'
 prepare:
   fetch:
@@ -32,7 +31,7 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
-    channel: rubocop-0-82
+    channel: rubocop-1-56-3
 exclude_patterns:
 - node_modules/
 - spec/

.github/workflows/ci.yaml

@@ -45,4 +45,4 @@ jobs:
     - name: Report code coverage
       if: "${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.0' }}"
       continue-on-error: true
-      uses: paambaati/codeclimate-action@v5
+      uses: paambaati/codeclimate-action@v6

app/models/manageiq/providers/ibm_power_hmc/infra_manager/host.rb

@@ -2,23 +2,23 @@ class ManageIQ::Providers::IbmPowerHmc::InfraManager::Host < ::Host
   include ManageIQ::Providers::IbmPowerHmc::InfraManager::MetricsCaptureMixin
 
   supports :capture do
-    unsupported_reason_add(:capture, _("PCM not enabled for this Host")) unless pcm_enabled
+    _("PCM not enabled for this Host") unless pcm_enabled
   end
 
   supports :stop do
-    unsupported_reason_add(:stop, _("Cannot shutdown a host that is powered off")) unless power_state == "on"
-    unsupported_reason_add(:stop, _("Cannot shutdown a host that is not HMC-managed")) unless hmc_managed
+    return _("Cannot shutdown a host that is powered off") unless power_state == "on"
+    return _("Cannot shutdown a host that is not HMC-managed") unless hmc_managed
   end
 
   supports :shutdown do
-    unsupported_reason_add(:shutdown, _("Cannot shutdown a host that is powered off")) unless power_state == "on"
-    unsupported_reason_add(:shutdown, _("Cannot shutdown a host with running vms")) if vms.where(:power_state => "on").any?
-    unsupported_reason_add(:shutdown, _("Cannot shutdown a host that is not HMC-managed")) unless hmc_managed
+    return _("Cannot shutdown a host that is powered off") unless power_state == "on"
+    return _("Cannot shutdown a host with running vms") if vms.where(:power_state => "on").any?
+    return _("Cannot shutdown a host that is not HMC-managed") unless hmc_managed
   end
 
   supports :start do
-    unsupported_reason_add(:start, _("Cannot start a host that is already powered on")) unless power_state == "off"
-    unsupported_reason_add(:start, _("Cannot start a host that is not HMC-managed")) unless hmc_managed
+    return _("Cannot start a host that is already powered on") unless power_state == "off"
+    return _("Cannot start a host that is not HMC-managed") unless hmc_managed
   end
 
   def shutdown

app/models/manageiq/providers/ibm_power_hmc/infra_manager/lpar.rb

@@ -1,13 +1,16 @@
 class ManageIQ::Providers::IbmPowerHmc::InfraManager::Lpar < ManageIQ::Providers::IbmPowerHmc::InfraManager::Vm
   supports :publish do
-    unsupported_reason_add(:provisioning, _('The LPAR is not connected to an active Provider')) if ext_management_system.nil?
+    _('The LPAR is not connected to an active Provider') if ext_management_system.nil?
   end
 
   supports :reconfigure_network_adapters
 
   supports :terminate do
-    unsupported_reason_add(:terminate, unsupported_reason(:control)) unless supports_control?
-    unsupported_reason_add(:terminate, _("Cannot delete a running partition")) unless power_state == "off"
+    if power_state == "off"
+      unsupported_reason(:control)
+    else
+      _("Cannot delete a running partition")
+    end
   end
 
   def provider_object(connection = nil)

app/models/manageiq/providers/ibm_power_hmc/infra_manager/template.rb

@@ -1,14 +1,14 @@
 class ManageIQ::Providers::IbmPowerHmc::InfraManager::Template < ManageIQ::Providers::InfraManager::Template
   supports :provisioning do
     if ext_management_system
-      unsupported_reason_add(:provisioning, ext_management_system.unsupported_reason(:provisioning)) unless ext_management_system.supports?(:provisioning)
+      ext_management_system.unsupported_reason(:provisioning)
     else
-      unsupported_reason_add(:provisioning, _('The Template is not connected to an active Provider'))
+      _('The Template is not connected to an active Provider')
     end
   end
 
   supports :clone do
-    unsupported_reason_add(:clone, _('The Template is not connected to an active Provider')) if ext_management_system.nil?
+    _('The Template is not connected to an active Provider') if ext_management_system.nil?
   end
 
   def do_request(request_type, options)

app/models/manageiq/providers/ibm_power_hmc/infra_manager/vm.rb

@@ -7,21 +7,19 @@ class ManageIQ::Providers::IbmPowerHmc::InfraManager::Vm < ManageIQ::Providers::
   supports :capture
 
   supports :control do
-    unsupported_reason_add(:control, _("Host is not HMC-managed")) unless host_hmc_managed
+    _("Host is not HMC-managed") unless host_hmc_managed
   end
 
   supports :rename do
-    unsupported_reason_add(:rename, _("Host is not HMC-managed")) unless host_hmc_managed
+    _("Host is not HMC-managed") unless host_hmc_managed
   end
 
   supports :set_description do
-    unsupported_reason_add(:set_description, _("Host is not HMC-managed")) unless host_hmc_managed
+    _("Host is not HMC-managed") unless host_hmc_managed
   end
 
   supports :native_console do
-    reason ||= _("VM Console not supported because VM is orphaned") if orphaned?
-    reason ||= _("VM Console not supported because VM is archived") if archived?
-    unsupported_reason_add(:native_console, reason) if reason
+    unsupported_reason(:action)
   end
 
   def provider_object(_connection = nil)

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

spec/models/manageiq/providers/ibm_power_hmc/infra_manager/lpar_spec.rb

@@ -36,39 +36,39 @@
       host.advanced_settings.create!(:name => "hmc_managed", :value => "true")
       vm.raw_power_state = "running"
       expect(vm.vm_powered_on?).to be true
-      expect(vm.supports_start?).to be false
-      expect(vm.supports_stop?).to (be true), "unsupported reason: #{vm.unsupported_reason(:stop)}"
-      expect(vm.supports_suspend?).to (be true), "unsupported reason: #{vm.unsupported_reason(:suspend)}"
+      expect(vm.supports?(:start)).to be false
+      expect(vm.supports?(:stop)).to (be true), "unsupported reason: #{vm.unsupported_reason(:stop)}"
+      expect(vm.supports?(:suspend)).to (be true), "unsupported reason: #{vm.unsupported_reason(:suspend)}"
       vm.raw_power_state = "not activated"
       expect(vm.vm_powered_on?).to be false
-      expect(vm.supports_start?).to (be true), "unsupported reason: #{vm.unsupported_reason(:start)}"
-      expect(vm.supports_stop?).to be false
-      expect(vm.supports_suspend?).to be false
+      expect(vm.supports?(:start)).to (be true), "unsupported reason: #{vm.unsupported_reason(:start)}"
+      expect(vm.supports?(:stop)).to be false
+      expect(vm.supports?(:suspend)).to be false
     end
     it "does not support power operations" do
       host.advanced_settings.create!(:name => "hmc_managed", :value => "false")
       vm.raw_power_state = "running"
       expect(vm.vm_powered_on?).to be true
-      expect(vm.supports_start?).to be false
-      expect(vm.supports_stop?).to be false
-      expect(vm.supports_suspend?).to be false
+      expect(vm.supports?(:start)).to be false
+      expect(vm.supports?(:stop)).to be false
+      expect(vm.supports?(:suspend)).to be false
       vm.raw_power_state = "not activated"
       expect(vm.vm_powered_on?).to be false
-      expect(vm.supports_start?).to be false
-      expect(vm.supports_stop?).to be false
-      expect(vm.supports_suspend?).to be false
+      expect(vm.supports?(:start)).to be false
+      expect(vm.supports?(:stop)).to be false
+      expect(vm.supports?(:suspend)).to be false
     end
     it "does not support power operations (no advanced setting)" do
       vm.raw_power_state = "running"
       expect(vm.vm_powered_on?).to be true
-      expect(vm.supports_start?).to be false
-      expect(vm.supports_stop?).to be false
-      expect(vm.supports_suspend?).to be false
+      expect(vm.supports?(:start)).to be false
+      expect(vm.supports?(:stop)).to be false
+      expect(vm.supports?(:suspend)).to be false
       vm.raw_power_state = "not activated"
       expect(vm.vm_powered_on?).to be false
-      expect(vm.supports_start?).to be false
-      expect(vm.supports_stop?).to be false
-      expect(vm.supports_suspend?).to be false
+      expect(vm.supports?(:start)).to be false
+      expect(vm.supports?(:stop)).to be false
+      expect(vm.supports?(:suspend)).to be false
     end
   end