knife-vsphere 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1590f83d24583a54afdd8e0d20e6cebdbe68a16c
-  data.tar.gz: 1ad17a8abad640718689b93a16879734c27f8250
+  metadata.gz: dc8369abb89134912a7e683ce60b1bbd0e8d484f
+  data.tar.gz: 813c2580d02825cd3d14376b5a4e18d982cb6cf7
 SHA512:
-  metadata.gz: 6a220f46264fb88086e93bc61195e3c093048604f07eabeadbe4cabb78201dbc4671df728aa7372c3363ec176c0266b3fc267fb47065d5fd68eeedda1f0cdd61
-  data.tar.gz: 344665daa9c9849c83d8ea1b2fa6e1872ca487424c691462f6b89ae7f53e2a7c51d74cfb6c77fc876c20b937bde297b3bb5695d4182c20e8186e4a98ca3460a1
+  metadata.gz: 46f01a944324a64476df295187ba4859ade28677c4a47c62c3e1603e1804150fa60d0db72fa2ac829e0f14e49cb8a4e05ff9646abd4f30674bbf727fbb088d61
+  data.tar.gz: ccaa4f2c5d8a44349ad90e36a56c041f10ecb9479062daa44fd63953c9f8b41440b3cc259571db7e76f5c55bba16d062f293a056c1cbc32441fce9e5a526d3f3

data/lib/chef/knife/base_vsphere_command.rb

@@ -246,6 +246,19 @@ class Chef
         networks.first
       end
 
+      def find_pool_folder(folderName)
+        dc = datacenter
+        base_entity = dc.hostFolder
+        entity_array = folderName.split('/')
+        entity_array.each do |entityArrItem|
+          if entityArrItem != ''
+            base_entity = base_entity.childEntity.grep(RbVmomi::VIM::ManagedObject).find { |f| f.name == entityArrItem } ||
+                          abort("no such folder #{folderName} while looking for #{entityArrItem}")
+          end
+        end
+        base_entity
+      end
+
       def find_pool(poolName)
         dc = datacenter
         base_entity = dc.hostFolder

data/lib/chef/knife/vsphere_pool_list.rb

@@ -25,19 +25,6 @@ class Chef::Knife::VspherePoolList < Chef::Knife::BaseVsphereCommand
     end
   end
 
-  def find_pool_folder(folderName)
-    dc = datacenter
-    base_entity = dc.hostFolder
-    entity_array = folderName.split('/')
-    entity_array.each do |entityArrItem|
-      if entityArrItem != ''
-        base_entity = base_entity.childEntity.grep(RbVmomi::VIM::ManagedObject).find { |f| f.name == entityArrItem } ||
-                      abort("no such folder #{folderName} while looking for #{entityArrItem}")
-      end
-    end
-    base_entity
-  end
-
   def run
     vim_connection
     base_folder = find_pool_folder(get_config(:folder))

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -23,6 +23,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   AUTO_MAC = 'auto'
   # A NO IP for you to use!
   NO_IPS = ''
+  # a linklayer origin is an actual nic
+  ORIGIN_IS_REAL_NIC = 'linklayer'.freeze
 
   include Chef::Knife::WinrmBase
   include CustomizationHelper
@@ -424,10 +426,15 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     # Multiple reboots occur during guest customization in which a link-local
     # address is assigned. As such, we need to wait until a routable IP address
     # becomes available. This is most commonly an issue with Windows instances.
-    sleep 2 while vm.guest.net[bootstrap_nic_index].ipConfig.ipAddress.detect { |addr| IPAddr.new(addr.ipAddress).ipv4? }.origin == 'linklayer'
+    sleep 2 while vm_is_waiting_for_ip?(vm)
     vm.guest.net[bootstrap_nic_index].ipAddress.detect { |addr| IPAddr.new(addr).ipv4? }
   end
 
+  def vm_is_waiting_for_ip?(vm)
+    first_ip_address = vm.guest.net[bootstrap_nic_index].ipConfig.ipAddress.detect { |addr| IPAddr.new(addr.ipAddress).ipv4? }
+    first_ip_address.nil? || first_ip_address.origin == ORIGIN_IS_REAL_NIC
+  end
+
   def guest_address(vm)
     puts 'Waiting for network interfaces to become available...'
     sleep 2 while vm.guest.net.empty? || !vm.guest.ipAddress
@@ -687,9 +694,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
         # We should get here with the customizations set, either by a plugin or a --cspec
         fatal_exit 'Windows clones need a customization identity. Try passing a --cspec or making a --cplugin' if cust_spec.identity.props.empty?
 
-        identification = RbVmomi::VIM.CustomizationIdentification(
-          joinWorkgroup: cust_spec.identity.identification.joinWorkgroup
-        )
+        identification = identification_for_spec(cust_spec)
+
         license_file_print_data = RbVmomi::VIM.CustomizationLicenseFilePrintData(
           autoMode: cust_spec.identity.licenseFilePrintData.autoMode
         ) if cust_spec.identity.licenseFilePrintData # optional param
@@ -983,4 +989,21 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   def bootstrap_nic_index
     Integer(get_config(:bootstrap_nic))
   end
+
+  def identification_for_spec(cust_spec)
+    # If --cdomain matches what is in --cspec then use identification from the --cspec, else use --cdomain
+    case domain = get_config(:customization_domain)
+    when nil?
+      # Fall back to original behavior of using joinWorkgroup from the --cspec
+      RbVmomi::VIM.CustomizationIdentification(
+        joinWorkgroup: cust_spec.identity.identification.joinWorkgroup
+      )
+    when cust_spec.identity.identification.joinDomain
+      cust_spec.identity.identification
+    else
+      RbVmomi::VIM.CustomizationIdentification(
+        joinDomain: domain
+      )
+    end
+  end
 end

data/lib/chef/knife/vsphere_vm_disk_list.rb

@@ -27,8 +27,9 @@ class Chef::Knife::VsphereVmDiskList < Chef::Knife::BaseVsphereCommand
     end
 
     disks.each do |disk|
-      puts '%3d %20s %s' % [disk.unitNumber,
+      puts '%3d %20s %20s %s' % [disk.unitNumber,
                             disk.deviceInfo.label,
+                            disk.backing.datastore.name,
                             Filesize.from("#{disk.capacityInKB} KiB").pretty]
     end
   end

data/lib/chef/knife/vsphere_vm_migrate.rb

@@ -28,21 +28,13 @@ class Chef::Knife::VsphereVmMigrate < Chef::Knife::BaseVsphereCommand
          long: '--resource-pool POOL',
          description: 'The resource pool into which to put the VM'
 
-  def traverse_folders_for_pool(folder, poolname)
-    children = folder.children.find_all
-    children.each do |child|
-      if child.class == RbVmomi::VIM::ClusterComputeResource || child.class == RbVmomi::VIM::ComputeResource || child.class == RbVmomi::VIM::ResourcePool
-        return child if child.name == poolname
-      elsif child.class == RbVmomi::VIM::Folder
-        pool = traverse_folders_for_pool(child, poolname)
-        return pool if pool
+  def find_host_folder(folder, name)
+    folder.childEntity.each do |cluster|
+      cluster.host.each do |host|
+        return host if host.name == name
       end
     end
-    false
-  end
-
-  def find_host_folder(folder, _type, name)
-    folder.host.find { |o| o.name == name }
+    nil
   end
 
   def run
@@ -62,12 +54,9 @@ class Chef::Knife::VsphereVmMigrate < Chef::Knife::BaseVsphereCommand
     priority = config[:priority]
     dest_host = config[:dest_host]
     ndc = find_datastore(config[:dest_datastore]) || abort('dest-datastore not found')
-    npool = find_pool(config[:resource_pool])
-    folderd = dc.hostFolder
-    pool = traverse_folders_for_pool(folderd, config[:resource_pool]) || abort("Pool #{poolname} not found")
-    h = find_host_folder(pool, RbVmomi::VIM::HostSystem, dest_host)
-    migrate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(datastore: ndc, pool: npool, host: h)
-    # puts migrate_spec.host.name
+    pool = find_pool(config[:resource_pool]) if config[:resource_pool]
+    dest_host = find_host_folder(dc.hostFolder, dest_host)
+    migrate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(datastore: ndc, pool: pool, host: dest_host)
     vm.RelocateVM_Task(spec: migrate_spec, priority: priority).wait_for_completion
   end
 end

data/lib/knife-vsphere/version.rb

@@ -1,5 +1,5 @@
 # The main knife-vsphere module.
 module KnifeVsphere
   # The version of this gem.
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife