fog-vsphere 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0dddb289327d2871f911801e572de9b9f3301a1eb3b0da0e9aeb60f8660fc3d
-  data.tar.gz: 2ed6a2f1ac3c94187cfdfc9dcc683f09c32c382c89872da97914754b4c567514
+  metadata.gz: 4991c02472ff132b2a1edef665c3dee7ee98ecec1a98bbad65947e574a9d6957
+  data.tar.gz: e484ae1b367e65fd7d799d1f50673a6584221da5e52ad610cd525e1d32e7de42
 SHA512:
-  metadata.gz: 01ca149030adc6f5d6b76b2ee2f4c9e7986dd533f99ab49cea195f6cb8ec56da761851e577f93dab33fbcb3d4e044637b7f0b98dfbee105a2f87fc4f1c4b52da
-  data.tar.gz: c0eb59366051e13703bf0a81ba091e84796dd1f1aae5e31260eb0bc9fa4dca46d56e4e1514daf06691b497b367b7735bb85f1fd102d4d8ad87c34e708e641ba9
+  metadata.gz: 0aed9e163c96fadd05853581565a520e841b4df4ff2509b5c8952ee9421f65ebd35d03cd4f94366708d866e97c9b068221818cc02c1e9848fec2041217122d23
+  data.tar.gz: d22e96a6ccaa8bdfd0a1c6ae564ba50317e08b6ab718ce78e1ace8c0422a05ea56fc9590e2ecc341b86ef6d5808b6289874f4b3312542f00c126187c108c3a4f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v2.0.1
+
+* Ensure views are destroyed after use (#122)
+* rescue nil for retrieving vm.config.instanceUuid (#123)
+
 ## v2.0.0
 
 * Drop support for ruby versions < 2.0.0

data/CONTRIBUTORS.md

@@ -4,6 +4,7 @@
 * Ben Talbot - btalbot <ben_t48@hotmail.com>
 * Carl Caum <carl@carlcaum.com>
 * Carlos Sanchez <csanchez@maestrodev.com>
+* Chris Roberts <chrobert@redhat.com>
 * Chris Thompson <chris.thompson@govdelivery.com>
 * Chris Thompson <teaforthecat@gmail.com>
 * Christopher Oliver <coliver@datapipe.com>

data/lib/fog/vsphere/compute.rb

@@ -648,6 +648,30 @@ module Fog
             raise Fog::Vsphere::Errors::SecurityError, "The remote system presented a public key with hash #{pubkey_hash} but we're expecting a hash of #{expected_pubkey_hash || '<unset>'}.  If you are sure the remote system is authentic set vsphere_expected_pubkey_hash: <the hash printed in this message> in ~/.fog"
           end
         end
+
+        def list_container_view(datacenter_obj_or_name, type, container_object = nil)
+          dc = if datacenter_obj_or_name.kind_of?(String)
+                 find_raw_datacenter(datacenter_obj_or_name)
+               else
+                 datacenter_obj_or_name
+               end
+
+          container = if container_object
+                        dc.public_send(container_object)
+                      else
+                        dc
+                      end
+
+          container_view = connection.serviceContent.viewManager.CreateContainerView(
+            :container  => dc,
+            :type       =>  [type],
+            :recursive  => true
+          )
+
+          result = container_view.view
+          container_view.DestroyView
+          result
+        end
       end
     end
   end

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

@@ -11,13 +11,11 @@ module Fog
         protected
 
         def get_raw_datastore(name, datacenter_name)
-          dc = find_raw_datacenter(datacenter_name)
+          get_raw_datastores(datacenter_name).detect { |ds| ds.name == name }
+        end
 
-          connection.serviceContent.viewManager.CreateContainerView({
-            :container  => dc.datastoreFolder,
-            :type       =>  ["Datastore"],
-            :recursive  => true
-          }).view.select{|ds| ds.name == name}.first
+        def get_raw_datastores(datacenter_name)
+          list_container_view(datacenter_name, 'Datastore', :datastoreFolder)
         end
       end
 

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

@@ -12,8 +12,7 @@ module Fog
 
         def get_raw_network(name, datacenter_name, distributedswitch=nil)
           finder = choose_finder(name, distributedswitch)
-          networks = get_all_raw_networks(datacenter_name)
-          networks.find { |n| finder.call(n) }
+          get_all_raw_networks(datacenter_name).find { |n| finder.call(n) }
         end
       end
 
@@ -22,13 +21,7 @@ module Fog
         protected
 
         def get_all_raw_networks(datacenter_name)
-          dc = find_raw_datacenter(datacenter_name)
-          connection.serviceContent.viewManager.
-            CreateContainerView({
-                                 :container => dc.networkFolder,
-                                 :type =>      ["Network"],
-                                 :recursive => true
-                                }).view
+          list_container_view(datacenter_name, 'Network', :networkFolder)
         end
 
         def choose_finder(name, distributedswitch)

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

@@ -11,19 +11,13 @@ module Fog
         protected
 
         def get_raw_storage_pod(name, datacenter_name)
-          dc = find_raw_datacenter(datacenter_name)
-
-          connection.serviceContent.viewManager.CreateContainerView({
-            :container  => dc,
-            :type       => ["StoragePod"],
-            :recursive  => true
-          }).view.select{|pod| pod.name == name}.first
+          raw_storage_pods(datacenter_name).detect { |pod| pod.name == name}
         end
       end
 
       class Mock
         def get_storage_pod(name, datacenter_name)
-          list_storage_pods({datacenter: datacenter_name}).select{|h| h[:name] == name }.first
+          list_storage_pods({datacenter: datacenter_name}).detect { |h| h[:name] == name }
         end
       end
     end

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

@@ -27,7 +27,7 @@ module Fog
             product_version: host.summary.config.product.version,
             hostname:        (host.config.network.dnsConfig.hostName rescue nil),
             domainname:      (host.config.network.dnsConfig.domainName rescue nil),
-            vm_ids:          Proc.new { host[:vm].map {|vm| vm.config.instanceUuid } }
+            vm_ids:          Proc.new { host[:vm].map {|vm| vm.config.instanceUuid rescue nil} }
           }
         end
       end

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

@@ -10,18 +10,14 @@ module Fog
         end
 
         private
-        def raw_storage_pods(datacenter_name)
-          dc = find_raw_datacenter(datacenter_name)
 
-          connection.serviceContent.viewManager.CreateContainerView({
-            :container  => dc,
-            :type       => ["StoragePod"],
-            :recursive  => true
-          }).view
+        def raw_storage_pods(datacenter_name)
+          list_container_view(datacenter_name, 'StoragePod')
         end
+
         protected
 
-        def storage_pod_attributes storage_pod, datacenter
+        def storage_pod_attributes(storage_pod, datacenter)
           {
             :id          => managed_obj_id(storage_pod),
             :name        => storage_pod.name,

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

@@ -27,14 +27,10 @@ module Fog
           datacenters = find_datacenters(options[:datacenter])
 
           vms = datacenters.map do |dc|
-            connection.serviceContent.viewManager.CreateContainerView({
-              :container  => dc.vmFolder,
-              :type       =>  ["VirtualMachine"],
-              :recursive  => true
-            }).view
+            list_container_view(dc, 'VirtualMachine', :vmFolder)
           end.flatten
           # remove all virtual machines that are not templates
-          vms.delete_if { |v| v.config.nil? or not v.config.template }
+          vms.delete_if { |v| v.config.nil? || !v.config.template }
 
           vms.map(&method(:convert_vm_mob_ref_to_attr_hash))
         end

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

@@ -23,15 +23,15 @@ module Fog
         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.delete_if { |v| v.config.nil? || 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)
@@ -46,7 +46,7 @@ module Fog
             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)
@@ -62,17 +62,11 @@ module Fog
           ## much faster to interact for some functions.
           datacenters = find_datacenters(datacenter_name)
           datacenters.map do |dc|
-            connection.serviceContent.viewManager.CreateContainerView({
-                                                                           :container  => dc.vmFolder,
-                                                                           :type       =>  ["VirtualMachine"],
-                                                                           :recursive  => true
-                                                                       }).view
+            list_container_view(dc, 'VirtualMachine', :vmFolder)
           end.flatten
         end
         def get_folder_path(folder, root = nil)
-          if (not folder.methods.include?('parent')) or (folder == root)
-            return
-          end
+          return if (!folder.methods.include?('parent')) || (folder == root)
           "#{get_folder_path(folder.parent)}/#{folder.name}"
         end
       end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core