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

Rename find_folder to find_vm_folder

Browse source 
This commit renames find_folder to find_vm_folder to clarify its intent to retrieve folders from the VM hierarchy. Without this change find_folder implies it may find folders that are not within the VM hierarchy.
This commit is contained in:
kirby@puppetlabs.com 2018-06-28 09:47:19 -07:00
parent 5c857f50f1
commit a6c2ef7bf3
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/vmpooler/providers/vsphere.rb
View file

@ -46,8 +46,7 @@ module Vmpooler
vms = []
@connection_pool.with_metrics do |pool_object|
connection = ensured_vsphere_connection(pool_object)
foldername = pool_config(pool_name)['folder']
folder_object = find_folder(pool_name, connection)
folder_object = find_vm_folder(pool_name, connection)
return vms if folder_object.nil?
@ -232,7 +231,7 @@ module Vmpooler
)
begin
vm_target_folder = find_folder(pool_name, connection)
vm_target_folder = find_vm_folder(pool_name, connection)
if vm_target_folder.nil? and @config[:config].key?('create_folders') and @config[:config]['create_folders'] == true
vm_target_folder = create_folder(connection, target_folder_path, target_datacenter_name)
end
@ -581,7 +580,7 @@ module Vmpooler
# +pool_name+:: the pool to find the folder for
# +connection+:: the vsphere connection object
# returns a ManagedObjectReference for the folder found or nil if not found
def find_folder(pool_name, connection)
def find_vm_folder(pool_name, connection)
# Find a folder by its inventory path and return the object
# Returns nil when the object found is not a folder
pool_configuration = pool_config(pool_name)