puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 18:08:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(GH-203) Change use of abort to raise in in vsphere_helper.rb

Browse source 
Previously, in `find_vm` and `find_pool` if in an expected object was found the
entire pool manager, and probably API process, will terminate due to the use of
`abort`.  This commit changes the use of abort to raise so that the error can be
trapped  and handled instead of the entire process being shutdown.  This is also
required so that the methods can be tested, otherwise rspec is shutdown
prematurely.
This commit is contained in:
Glenn Sarti 2017-03-13 17:11:33 -07:00
parent 07eb4f579a
commit fd93c5bea8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/vmpooler/vsphere_helper.rb
View file

@ -181,7 +181,7 @@ module Vmpooler
if base.is_a? RbVmomi::VIM::Folder if base.is_a? RbVmomi::VIM::Folder
base = base.childEntity.find { |f| f.name == folder } base = base.childEntity.find { |f| f.name == folder }
else else
abort "Unexpected object type encountered (#{base.class}) while finding folder" raise(RuntimeError, "Unexpected object type encountered (#{base.class}) while finding folder")
end end
end end
@ -284,7 +284,7 @@ module Vmpooler
when base.is_a?(RbVmomi::VIM::ResourcePool) when base.is_a?(RbVmomi::VIM::ResourcePool)
base = base.resourcePool.find { |f| f.name == pool } base = base.resourcePool.find { |f| f.name == pool }
else else
abort "Unexpected object type encountered (#{base.class}) while finding resource pool" raise(RuntimeError, "Unexpected object type encountered (#{base.class}) while finding resource pool")
end end
end end