Merge pull request ManageIQ#12255 from agrare/vmware/infra/cleanup_re…

…dundant_vm_pause Remove redundant vm_pause from VMware InfraManager
petervo · Nov 2, 2016 · facafbe · facafbe
2 parents 526c99c + dac3ba7
commit facafbe
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/app/models/manageiq/providers/vmware/infra_manager.rb b/app/models/manageiq/providers/vmware/infra_manager.rb
@@ -181,10 +181,6 @@ def vm_suspend(vm, options = {})
       invoke_vim_ws(:suspend, vm, options[:user_event])
     end
 
-    def vm_pause(vm, options = {})
-      invoke_vim_ws(:pause, vm, options[:user_event])
-    end
-
     def vm_shutdown_guest(vm, options = {})
       invoke_vim_ws(:shutdownGuest, vm, options[:user_event])
     end

diff --git a/gems/pending/VMwareWebService/MiqVimVm.rb b/gems/pending/VMwareWebService/MiqVimVm.rb
@@ -114,8 +114,7 @@ def suspend(wait = true)
     $vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).suspend: returned from suspendVM_Task" if $vim_log
     return taskMor unless wait
     waitForTask(taskMor)
-  end # def pause
-  alias_method :pause, :suspend
+  end # def suspend
 
   def reset(wait = true)
     $vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).reset: calling resetVM_Task" if $vim_log

diff --git a/spec/models/manageiq/providers/vmware/infra_manager/vm_spec.rb b/spec/models/manageiq/providers/vmware/infra_manager/vm_spec.rb
@@ -21,11 +21,6 @@
       include_examples "Vm operation is available when powered on"
     end
 
-    context("with :pause") do
-      let(:state) { :pause }
-      include_examples "Vm operation is available when powered on"
-    end
-
     context("with :shutdown_guest") do
       let(:state) { :shutdown_guest }
       include_examples "Vm operation is available when powered on"