fog-vsphere 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6be1e2a1637899ea613c7b58dbab33a4414d252e
-  data.tar.gz: c52b5f6072294919ff343ce384213b6ef2eb04b2
+  metadata.gz: 06eca68fe929424802778ca57a027d81db538f60
+  data.tar.gz: 2118bba5d8f23607ddf6133f4fb81fafd58c113d
 SHA512:
-  metadata.gz: 07c537deccc790717d3166a6de38eba43338e7c59ea12d5073bcf4c2090cb7f4f1f094669d8d262de3c412a83b6f05d59f7940fc725dd54c76361da436206a2b
-  data.tar.gz: 010e3c52e24594f2088f5649145cae621a2aa874250680f48d92815a568017016e73b979f55357e841355bc68595fbc095d9b339d5366659d4181d2d2958a18e
+  metadata.gz: 255282ce591683af7e4edd73719d73b6d541acfa33ba2017a1439368431f9a29de7de33b78a6fa5bb422886651088b7f01f554329adb8f0d643ed178da499e85
+  data.tar.gz: 8fecbdda3f9b1f05065976b221557b0dbd1f8f2c3197889948b02e21014975d2f8ce565468e6e62b2d210ed57fabba6b94f700a42ef7df94a398882c8afdb954

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.9.1
+
+* Ensure connection has not been closed before using
+
 ## v1.9.0
 
 * Add :connectable option to `update_vm_interface`

data/lib/fog/vsphere/compute.rb

@@ -156,7 +156,7 @@ module Fog
         }
 
         def convert_vm_view_to_attr_hash(vms)
-          vms = @connection.serviceContent.propertyCollector.collectMultiple(vms,*ATTR_TO_PROP.values.uniq)
+          vms = connection.serviceContent.propertyCollector.collectMultiple(vms,*ATTR_TO_PROP.values.uniq)
           vms.map { |vm| props_to_attr_hash(*vm) }
         end
 
@@ -525,6 +525,15 @@ module Fog
           authenticate
         end
 
+        def connection
+          if @connection.nil? || @connection.serviceContent.sessionManager.currentSession.nil?
+            Fog::Logger.debug('Reconnecting to vSphere.')
+            @connection = nil
+            reload
+          end
+          @connection
+        end
+
         def reload
           connect
           # Check if the negotiation was ever run

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

@@ -60,7 +60,7 @@ module Fog
             :configSpec => vm_cfg,
             :host => host,
           )
-          srm = @connection.serviceContent.storageResourceManager
+          srm = connection.serviceContent.storageResourceManager
           result = srm.RecommendDatastores(:storageSpec => storage_spec)
 
           # if result array contains recommendation, we can apply it

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

@@ -3,7 +3,7 @@ module Fog
     class Vsphere
       class Real
         def current_time
-          current_time = @connection.serviceInstance.CurrentTime
+          current_time = connection.serviceInstance.CurrentTime
           { 'current_time' => current_time }
         end
       end

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

@@ -15,7 +15,7 @@ module Fog
         end
 
         def get_raw_datacenter name
-          @connection.serviceInstance.find_datacenter(name)
+          connection.serviceInstance.find_datacenter(name)
         end
       end
 

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

@@ -13,7 +13,7 @@ module Fog
         def get_raw_datastore(name, datacenter_name)
           dc = find_raw_datacenter(datacenter_name)
 
-          @connection.serviceContent.viewManager.CreateContainerView({
+          connection.serviceContent.viewManager.CreateContainerView({
             :container  => dc.datastoreFolder,
             :type       =>  ["Datastore"],
             :recursive  => true

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

@@ -23,7 +23,7 @@ module Fog
 
         def get_all_raw_networks(datacenter_name)
           dc = find_raw_datacenter(datacenter_name)
-          @connection.serviceContent.viewManager.
+          connection.serviceContent.viewManager.
             CreateContainerView({
                                  :container => dc.networkFolder,
                                  :type =>      ["Network"],

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

@@ -13,7 +13,7 @@ module Fog
         def get_raw_storage_pod(name, datacenter_name)
           dc = find_raw_datacenter(datacenter_name)
 
-          @connection.serviceContent.viewManager.CreateContainerView({
+          connection.serviceContent.viewManager.CreateContainerView({
             :container  => dc,
             :type       => ["StoragePod"],
             :recursive  => true

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

@@ -16,7 +16,7 @@ module Fog
                  when true
                    params = {:uuid => id, :vmSearch => true, :instanceUuid => true}
                    params[:datacenter] = raw_datacenter if dc
-                   @connection.searchIndex.FindByUuid(params)
+                   connection.searchIndex.FindByUuid(params)
                  else
                    # try to find based on VM name
                    if dc

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

@@ -3,7 +3,7 @@ module Fog
     class Vsphere
       class Real
         def list_customfields()
-          @connection.serviceContent.customFieldsManager.field.map do |customfield|
+          connection.serviceContent.customFieldsManager.field.map do |customfield|
             {
               :key   => customfield.key.to_i,
               :name  => customfield.name,

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

@@ -16,7 +16,7 @@ module Fog
         protected
 
         def raw_getpathmo mo
-          if mo.parent == nil or mo.parent.name == @connection.rootFolder.name then
+          if mo.parent == nil or mo.parent.name == connection.rootFolder.name then
             [ mo.name ]
           else
             [ raw_getpathmo(mo.parent), mo.name ].flatten
@@ -24,7 +24,7 @@ module Fog
         end
 
         def raw_datacenters folder=nil
-          folder ||= @connection.rootFolder
+          folder ||= connection.rootFolder
           @raw_datacenters ||= get_raw_datacenters_from_folder folder
         end
 

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

@@ -11,7 +11,7 @@ module Fog
             :interactiveSession => false
           )
 
-          p_manager = @connection.serviceContent.guestOperationsManager.processManager
+          p_manager = connection.serviceContent.guestOperationsManager.processManager
           processes = p_manager.ListProcessesInGuest(:vm => vm, :auth => auth)
           processes.map do |pi|
             Process.new(

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

@@ -13,7 +13,7 @@ module Fog
         def raw_storage_pods(datacenter_name)
           dc = find_raw_datacenter(datacenter_name)
 
-          @connection.serviceContent.viewManager.CreateContainerView({
+          connection.serviceContent.viewManager.CreateContainerView({
             :container  => dc,
             :type       => ["StoragePod"],
             :recursive  => true

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

@@ -27,7 +27,7 @@ module Fog
           datacenters = find_datacenters(options[:datacenter])
 
           vms = datacenters.map do |dc|
-            @connection.serviceContent.viewManager.CreateContainerView({
+            connection.serviceContent.viewManager.CreateContainerView({
               :container  => dc.vmFolder,
               :type       =>  ["VirtualMachine"],
               :recursive  => true

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

@@ -62,7 +62,7 @@ module Fog
           ## much faster to interact for some functions.
           datacenters = find_datacenters(datacenter_name)
           datacenters.map do |dc|
-            @connection.serviceContent.viewManager.CreateContainerView({
+            connection.serviceContent.viewManager.CreateContainerView({
                                                                            :container  => dc.vmFolder,
                                                                            :type       =>  ["VirtualMachine"],
                                                                            :recursive  => true

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

@@ -22,7 +22,7 @@ module Fog
           datacenter = get_raw_datacenter(options['datacenter'])
           filename = options['filename'] || File.basename(options['local_path'])
           unless datastore.exists? options['upload_directory']+'/'
-            @connection.serviceContent.fileManager.MakeDirectory :name => "[#{options['datastore']}] #{options['upload_directory']}",
+            connection.serviceContent.fileManager.MakeDirectory :name => "[#{options['datastore']}] #{options['upload_directory']}",
                                                                  :datacenter => datacenter,
                                                                  :createParentDirectories => false
           end

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

@@ -618,7 +618,7 @@ module Fog
               :cloneName => options['name'],
               :vm => vm_mob_ref,
             )
-            srm = @connection.serviceContent.storageResourceManager
+            srm = connection.serviceContent.storageResourceManager
             result = srm.RecommendDatastores(:storageSpec => storage_spec)
 
             # if result array contains recommendation, we can apply it

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

@@ -6,7 +6,7 @@ module Fog
           raise ArgumentError, "instance_uuid is a required parameter" unless options.key? 'instance_uuid'
 
           search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm_mob_ref    = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm_mob_ref    = connection.searchIndex.FindAllByUuid(search_filter).first
           task          = vm_mob_ref.ReconfigVM_Task(:spec => {
             :extraConfig => [
               { :key => 'RemoteDisplay.vnc.enabled',  :value => options[:enabled] ? 'true' : 'false' },
@@ -21,7 +21,7 @@ module Fog
         # return a hash of VNC attributes required to view the console
         def vm_get_vnc uuid
           search_filter = { :uuid => uuid, 'vmSearch' => true, 'instanceUuid' => true }
-          vm = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm = connection.searchIndex.FindAllByUuid(search_filter).first
           Hash[vm.config.extraConfig.map do |config|
             if config.key =~ /^RemoteDisplay\.vnc\.(\w+)$/
               [$1.to_sym, config.value]

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

@@ -18,7 +18,7 @@ module Fog
           raise ArgumentError, "password is a required parameter" unless options.key? 'password'
 
           search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm_mob_ref = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm_mob_ref = connection.searchIndex.FindAllByUuid(search_filter).first
 
           auth = RbVmomi::VIM::NamePasswordAuthentication(:interactiveSession => false,
                                                           :username => options['user'],
@@ -28,7 +28,7 @@ module Fog
                                                 :arguments => options['args'],
                                                 :workingDirectory => options['working_dir'])
 
-          gom = @connection.serviceContent.guestOperationsManager
+          gom = connection.serviceContent.guestOperationsManager
           gom.processManager.StartProgramInGuest(:vm => vm_mob_ref, :auth => auth, :spec => spec)
         end
       end

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

@@ -9,7 +9,7 @@ module Fog
 
           # Find the VM Object
           search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm_mob_ref = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm_mob_ref = connection.searchIndex.FindAllByUuid(search_filter).first
 
           unless vm_mob_ref.kind_of? RbVmomi::VIM::VirtualMachine
             raise Fog::Vsphere::Errors::NotFound,

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

@@ -7,7 +7,7 @@ module Fog
           raise ArgumentError, "instance_uuid is a required parameter" unless options.key? 'instance_uuid'
 
           search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm_mob_ref = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm_mob_ref = connection.searchIndex.FindAllByUuid(search_filter).first
 
           if options['force'] then
             task = vm_mob_ref.PowerOffVM_Task

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

@@ -6,7 +6,7 @@ module Fog
           raise ArgumentError, "instance_uuid is a required parameter" unless options.key? 'instance_uuid'
 
           search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm_mob_ref = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm_mob_ref = connection.searchIndex.FindAllByUuid(search_filter).first
 
           task = vm_mob_ref.PowerOnVM_Task
           task.wait_for_completion

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

@@ -7,7 +7,7 @@ module Fog
           raise ArgumentError, "instance_uuid is a required parameter" unless options.key? 'instance_uuid'
 
           search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm_mob_ref = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm_mob_ref = connection.searchIndex.FindAllByUuid(search_filter).first
 
           if options['force'] then
             task = vm_mob_ref.ResetVM_Task

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

@@ -7,7 +7,7 @@ module Fog
           options = { 'force' => false }.merge(options)
 
           search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm = connection.searchIndex.FindAllByUuid(search_filter).first
 
           if options['force']
             suspend_forcefully(vm)

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.9.0'.freeze
+    VERSION = '1.9.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core