Merge pull request #204 from miha-plesko/vm-delete-followup

Use utility function vm_powered_on? instead manual comparison (cherry picked from commit 15f83b5) https://bugzilla.redhat.com/show_bug.cgi?id=1552683
ManageIQ · Mar 8, 2018 · 1a31805 · 1a31805
1 parent f5dad10
commit 1a31805
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/models/manageiq/providers/vmware/cloud_manager/vm/operations.rb b/app/models/manageiq/providers/vmware/cloud_manager/vm/operations.rb
@@ -5,7 +5,7 @@ module ManageIQ::Providers::Vmware::CloudManager::Vm::Operations
 
  included do
  supports :terminate do
- unsupported_reason_add(:terminate, "The VM is powered on") unless current_state == "off"
+ unsupported_reason_add(:terminate, "The VM is powered on") if vm_powered_on?
  end
  end
 

diff --git a/spec/models/manageiq/providers/vmware/cloud_manager/vm_spec.rb b/spec/models/manageiq/providers/vmware/cloud_manager/vm_spec.rb
@@ -34,6 +34,11 @@
  let(:state) { :standby_guest }
  include_examples "Vm operation is not available"
  end
+
+ context("with :terminate") do
+ let(:state) { :terminate }
+ include_examples "Vm operation is available when not powered on"
+ end
  end
 
  context "when destroyed" do