kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Merge pull request #1673 from aussielunix/Bug-servers-all-filter

Browse source 
[vsphere] fix bug where servers.all was ignoring filters due to hash merging in the wrong direction
This commit is contained in:
Ohad Levy 2013-03-19 13:26:55 -07:00
commit 13655f1056
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/fog/vsphere/models/compute/servers.rb
View file

@ -17,13 +17,15 @@ module Fog
# 'folder' => '/Datacenters/vm/Jeff/Templates' will be MUCH faster. # 'folder' => '/Datacenters/vm/Jeff/Templates' will be MUCH faster.
# than simply listing everything. # than simply listing everything.
def all(filters = { }) def all(filters = { })
load service.list_virtual_machines(filters.merge( f = {
:datacenter => datacenter, :datacenter => datacenter,
:cluster => cluster, :cluster => cluster,
:network => network, :network => network,
:resource_pool => resource_pool, :resource_pool => resource_pool,
:folder => folder :folder => folder
)) }.merge(filters)
load service.list_virtual_machines(f)
end end
def get(id, datacenter = nil) def get(id, datacenter = nil)
@ -31,9 +33,7 @@ module Fog
rescue Fog::Compute::Vsphere::NotFound rescue Fog::Compute::Vsphere::NotFound
nil nil
end end
end end
end end
end end
end end