fog-vsphere 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ecf2e2e7786673208a3301191bc8a2ccd5fc1f
-  data.tar.gz: c4282d6b04ab981c10e65d63ad071091743ece0e
+  metadata.gz: 96a65cbc2b8dff64e149f6e108ef19d5ddaa5011
+  data.tar.gz: a531b24b12fe6410476a4532f9c4c5584125bb12
 SHA512:
-  metadata.gz: 49594f0acf240a9e7e8e49d8a0729f040c714de249e610c73cb6e2212e6a51c1cdc2340ea8bf493a2edfeb21f4e85fe3bcae2880dffe19a631256d8f7c1ca085
-  data.tar.gz: 19532eac88ce221bb6d0bdeef0511f399552625d5677faba6ca0c024bb0ebd24112d54acfd821d80d005fa76ef678e9e6f30464dfefb24c7d47cf5b6bcb43e85
+  metadata.gz: a323cdbb8d6541a7a9597e9bf7628b71e13993a322334ed4beeec504ac68ec87a4d7342a850213c2f6b0f352fceb5343cddab989f5cb05556aba748795c0e834
+  data.tar.gz: d52f7e564b586cd2eb5727b260f5e51c2394486175d55a975a69d72fd3591acf727a85032bf92ef272d06224b1b15f8431c4e7c1bdebf5c5105b61c38d5d5a3c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.5.0 1/18/2016
+
+* Fix wrong string assignment in storage pods
+* Pass what we know about the VM from the folder to VM creation
+* Improve performance of recursive get_vm_by_name
+* Ensure folder.vms only searches the VMs in that folder
+* Add recursive parameter to folder.vms to search recursively
+
 ## v0.4.0 12/15/2015
 
 * Fix cannot create vm on "Resources" resource pool

data/lib/fog/vsphere/models/compute/folder.rb

@@ -10,9 +10,10 @@ module Fog
         attribute :path
         attribute :type
 
-        def vms
+        # Pass :recursive => true to get a Servers object that searches for VM names recursively
+        def vms(options = {})
           return [] if type.to_s != 'vm'
-          service.servers(:folder => path, :datacenter => datacenter)
+          service.servers(:folder => path, :datacenter => datacenter, :recursive => options[:recursive])
         end
 
         def to_s

data/lib/fog/vsphere/models/compute/servers.rb

@@ -10,6 +10,7 @@ module Fog
         attr_accessor :cluster
         attr_accessor :resource_pool
         attr_accessor :folder
+        attr_accessor :recursive
 
         # 'folder' => '/Datacenters/vm/Jeff/Templates' will be MUCH faster.
         # than simply listing everything.
@@ -19,17 +20,29 @@ module Fog
             :cluster       => cluster,
             :network       => network,
             :resource_pool => resource_pool,
-            :folder        => folder
+            :folder        => folder,
+            :recursive     => recursive,
           }.merge(filters)
 
           load service.list_virtual_machines(f)
         end
 
         def get(id, datacenter = nil)
-          new service.get_virtual_machine id, datacenter
+          new service.get_virtual_machine id, datacenter, folder, recursive
         rescue Fog::Compute::Vsphere::NotFound
           nil
         end
+        
+        # Pass attributes we know about down to any VM we're creating
+        def new(attributes = {})
+          super({
+            :datacenter    => datacenter,
+            :path          => folder,
+            :cluster       => cluster,
+            :resource_pool => resource_pool,
+          }.merge(attributes))
+        end
+        
       end
     end
   end

data/lib/fog/vsphere/requests/compute/create_vm.rb

@@ -245,7 +245,7 @@ module Fog
           end
           # If we deploy the vm on a storage pod, datastore has to be an empty string
           if storage_pod
-            datastore ''
+            datastore = ''
           else
             datastore = "[#{disk.datastore}]"
           end

data/lib/fog/vsphere/requests/compute/get_folder.rb

@@ -53,9 +53,13 @@ module Fog
             :parent     => folder.parent.name,
             :datacenter => datacenter_name,
             :type       => folder_type(folder),
-            :path       => "/"+folder.path.map(&:last).join('/'),
+            :path       => folder_path(folder),
           }
         end
+        
+        def folder_path(folder)
+            "/"+folder.path.map(&:last).join('/')
+        end
 
         def folder_type(folder)
           types = folder.childType

data/lib/fog/vsphere/requests/compute/get_virtual_machine.rb

@@ -2,14 +2,14 @@ module Fog
   module Compute
     class Vsphere
       class Real
-        def get_virtual_machine(id, datacenter_name = nil)
+        def get_virtual_machine(id, datacenter_name = nil, folder = nil, recursive = false)
           # The larger the VM list the longer it will take if not searching based on UUID.
-          convert_vm_mob_ref_to_attr_hash(get_vm_ref(id, datacenter_name))
+          convert_vm_mob_ref_to_attr_hash(get_vm_ref(id, datacenter_name, folder, recursive))
         end
 
         protected
 
-        def get_vm_ref(id, dc = nil)
+        def get_vm_ref(id, dc = nil, folder = nil, recursive = false)
           raw_datacenter = find_raw_datacenter(dc) if dc
           vm = case is_uuid?(id)
                  # UUID based
@@ -20,29 +20,36 @@ module Fog
                  else
                    # try to find based on VM name
                    if dc
-                     get_vm_by_name(id, dc)
+                     get_vm_by_name(id, dc, folder, recursive)
                    else
-                     raw_datacenters.map { |d| get_vm_by_name(id, d["name"])}.compact.first
+                     raw_datacenters.map { |d| get_vm_by_name(id, d["name"], folder, recursive)}.compact.first
                    end
                end
           vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found")
         end
 
-        def get_vm_by_name(name, dc)
-          vms = raw_list_all_virtual_machines(dc)
+        def get_vm_by_name(name, dc, folder, recursive)
+          if folder
+            # This returns an Enumerator, which when called with .find will
+            # search only until it finds the VM we're looking for
+            vms = raw_list_all_virtual_machines_in_folder(folder, dc, recursive)
+          else
+            vms = raw_list_all_virtual_machines(dc)
+          end
 
-         if name.include?('/')
+          if name.include?('/')
             folder = File.dirname(name)
             basename = File.basename(name)
-            vms.keep_if { |v| v["name"] == basename && v.parent.pretty_path.include?(folder) }.first
+            vms.find { |v| v["name"] == basename && v.parent.pretty_path.include?(folder) }
           else
-            vms.keep_if { |v| v["name"] == name }.first
+            vms.find { |v| v["name"] == name }
           end
-        end
+        end        
+        
       end
 
       class Mock
-        def get_virtual_machine(id, datacenter_name = nil)
+        def get_virtual_machine(id, datacenter_name = nil, folder = nil, recursive = false)
           if is_uuid?(id)
             vm = list_virtual_machines({ 'instance_uuid' => id, 'datacenter' => datacenter_name }).first
           else

data/lib/fog/vsphere/requests/compute/list_virtual_machines.rb

@@ -11,7 +11,7 @@ module Fog
           if options['instance_uuid'] then
             [get_virtual_machine(options['instance_uuid'])]
           elsif options[:folder] && options[:datacenter] then
-            list_all_virtual_machines_in_folder(options[:folder], options[:datacenter])
+            list_all_virtual_machines_in_folder(options[:folder], options[:datacenter], options[:recursive])
           else
             list_all_virtual_machines(options)
           end
@@ -20,15 +20,33 @@ module Fog
 
         private
 
-        def list_all_virtual_machines_in_folder(path, datacenter_name)
-          folder = get_raw_vmfolder(path, datacenter_name)
-
-          vms = folder.children.grep(RbVmomi::VIM::VirtualMachine)
+        def list_all_virtual_machines_in_folder(path, datacenter_name, recursive)
+          vms = raw_list_all_virtual_machines_in_folder(path, datacenter_name, recursive).to_a
           # remove all template based virtual machines
           vms.delete_if { |v| v.config.nil? or v.config.template }
           vms.map(&method(:convert_vm_mob_ref_to_attr_hash))
         end
-
+        
+        def raw_list_all_virtual_machines_in_folder(path, datacenter_name, recursive)
+          folder = get_raw_vmfolder(path, datacenter_name)
+          folder_enumerator(folder, recursive)
+        end
+        
+        # An enumerator for a folder. Enumerates all the VMs in the folder, recursively if
+        # passed recursive=true
+        def folder_enumerator(raw_folder, recursive)
+          Enumerator.new do |yielder|
+            raw_folder.children.each do |child|
+              case child
+              when RbVmomi::VIM::Folder
+                folder_enumerator(child, true).each {|item| yielder.yield item} if recursive
+              when RbVmomi::VIM::VirtualMachine
+                yielder.yield child
+              end
+            end
+          end
+        end
+        
         def list_all_virtual_machines(options = { })
           raw_vms = raw_list_all_virtual_machines(options[:datacenter])
           vms = convert_vm_view_to_attr_hash(raw_vms)

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.