chef-provisioning-vsphere 0.5.7.dev2 → 0.5.7.dev3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ac4e44b90a73a34582f910658b09f1e2ad5f00a
-  data.tar.gz: 3c107f070e95134e88e1228ef526eaae75e9830e
+  metadata.gz: 0f778a9ae4af6203b2d0eb7f5663c1b1b8abada3
+  data.tar.gz: c8faca15f12bd087a48a16fd8748c089e7bc71b5
 SHA512:
-  metadata.gz: 98f85721b24298d0bf5b5338583ccd3546915f475457ce0644042f64a153d73ab30eb67a170f128f84b6c5b30f286bdcd78fec7a7481dc531af6f8aea930dbcf
-  data.tar.gz: 4645e6b4504f0459e9f9af212b5c1e2ce23e28badbca0369abb4f300fc587b0777258105dbafe214e3341d0bab98d7f83d5a42cbda2cf4db53ec71bbb0f747e5
+  metadata.gz: 08b07fcb55fadc5d25b1f747c40a6aa342147f797b81095760e545bc8af7e87844260e6fad8c36280409eb70a13aa694cb01a09fdc08aac7dc9563cf4262f621
+  data.tar.gz: df5967c9c2654ca2a40705248c9cd88c450f1a338a8635df26838177ebd7996190e7d4e92f66ab38deb7f4309dcbe40586e7f7726fb4ed6c5a09b679bca0a52e

data/lib/chef/provisioning/vsphere_driver/version.rb

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.5.7.dev2'
+  VERSION = '0.5.7.dev3'
 end

data/lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb

@@ -47,14 +47,6 @@ module ChefProvisioningVsphere
       )
     end
 
-    def vm_started?(vm, wait_on_port = 22)
-      return false if vm.nil?
-      state = vm.runtime.powerState
-      return false unless state == 'poweredOn'
-      return false unless port_ready?(vm, wait_on_port)
-      return true
-    end
-
     def vm_stopped?(vm)
       return true if vm.nil?
       state = vm.runtime.powerState
@@ -78,31 +70,6 @@ module ChefProvisioningVsphere
       end
     end
 
-    def port_ready?(vm, port)
-      vm_ip = vm.guest.ipAddress
-      return false if vm_ip.nil?
-
-      begin
-        tcp_socket = TCPSocket.new(vm_ip, port)
-        readable = IO.select([tcp_socket], nil, nil, 5)
-        if readable
-          true
-        else
-          false
-        end
-      rescue Errno::ETIMEDOUT
-        false
-      rescue Errno::EPERM
-        false
-      rescue Errno::ECONNREFUSED
-        false
-      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH
-        false
-      ensure
-        tcp_socket && tcp_socket.close
-      end
-    end
-
     #folder could be like:  /Level1/Level2/folder_name
     def find_folder(folder_name)
       base = datacenter.vmFolder
@@ -139,56 +106,6 @@ module ChefProvisioningVsphere
       vm.config.hardware.device.select {|d| d.is_a?(RbVmomi::VIM::VirtualEthernetCard)}
     end
 
-    def do_vm_clone(action_handler, vm_template, vm_name, options)
-      deviceAdditions = []
-
-      clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(
-        location: relocate_spec_for(vm_template, options),
-        powerOn: false,
-        template: false,
-        config: RbVmomi::VIM.VirtualMachineConfigSpec(
-          :cpuHotAddEnabled => true,
-          :memoryHotAddEnabled => true,
-          :cpuHotRemoveEnabled => true,
-          :deviceChange => Array.new)
-      )
-
-      clone_spec.customization = customization_options_from(action_handler, vm_template, vm_name, options)
-
-      unless options[:annotation].to_s.nil?
-        clone_spec.config.annotation = options[:annotation]
-      end
-
-      unless options[:num_cpus].to_s.nil?
-        clone_spec.config.numCPUs = options[:num_cpus]
-      end
-
-      unless options[:memory_mb].to_s.nil?
-        clone_spec.config.memoryMB = options[:memory_mb]
-      end
-
-      unless options[:network_name].nil?
-        deviceAdditions, changes = network_device_changes(action_handler, vm_template, options)
-        clone_spec.config.deviceChange = changes
-      end
-
-      vm_folder = find_folder(options[:vm_folder])
-      vm_template.CloneVM_Task(
-        name: vm_name,
-        folder: vm_folder,
-        spec: clone_spec
-      ).wait_for_completion
-
-      vm = find_vm(vm_folder, vm_name)
-
-      if options[:additional_disk_size_gb].to_i > 0
-        task = vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => [virtual_disk_for(vm, options)]))
-        task.wait_for_completion
-      end
-
-      vm
-    end
-
     def add_extra_nic(action_handler, vm_template, options, vm)
       deviceAdditions, changes = network_device_changes(action_handler, vm_template, options)
 
@@ -314,7 +231,9 @@ module ChefProvisioningVsphere
     def find_entity(name, parent_folder, &block)
       parts = name.split('/').reject(&:empty?)
       parts.each do |item|
+        Chef::Log.debug("Identifying entity part: #{item} in folder type: #{parent_folder.class}")
         if parent_folder.is_a? RbVmomi::VIM::Folder
+          Chef::Log.debug('Parent folder is a folder')
           parent_folder = parent_folder.childEntity.find { |f| f.name == item }
         else
           parent_folder = block.call(parent_folder, item)
@@ -344,13 +263,21 @@ module ChefProvisioningVsphere
     end
 
     def find_pool(pool_name)
+      Chef::Log.debug("Finding pool: #{pool_name}")
       pool = find_entity(pool_name, datacenter.hostFolder) do |parent, part|
         case parent
         when RbVmomi::VIM::ClusterComputeResource || RbVmomi::VIM::ComputeResource
+          Chef::Log.debug("finding #{part} in a #{parent.class}: #{parent.name}")
+          Chef::Log.debug("Parent root pool has #{parent.resourcePool.resourcePool.count} pools")
+          parent.resourcePool.resourcePool.each { |p| Chef::Log.debug(p.name ) }
           parent.resourcePool.resourcePool.find { |f| f.name == part }
         when RbVmomi::VIM::ResourcePool
+          Chef::Log.debug("finding #{part} in a Resource Pool: #{parent.name}")
+          Chef::Log.debug("Pool has #{parent.resourcePool.count} pools")
+          parent.resourcePool.each { |p| Chef::Log.debug(p.name ) }
           parent.resourcePool.find { |f| f.name == part }
         else
+          Chef::Log.debug("parent of #{part} is unexpected type: #{patrent.class}")
           nil
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.5.7.dev2
+  version: 0.5.7.dev3
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-13 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi