kitchen-vcenter 2.7.8 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e4016eb3acf59b1720fa8db8a286182337c9bd38528a94b52796f29f7779497
-  data.tar.gz: 7b73e59e8e6437d819fcede40a6bf34fcb691e44211a8b7ecc0d5b66db02dae9
+  metadata.gz: 1da356cf16429bae878bc2a5672f2c574c9cd82028914f4aca53d1311955eb4c
+  data.tar.gz: ddf119be74e493604cef87b3cf3d45e2c486492a26eeac5fd5bb6c21ef58a38a
 SHA512:
-  metadata.gz: 9fecbd078bec90c376c8c502926790e4d9bf308ddd8fc30b3911e2e06998fd63d6f21c7f2ce38c31e7227dd5b723506ab5da21d693797b6195653d1867d1af49
-  data.tar.gz: 5304bc077b139e731ab5530c9f76ea26292b0349b89109f924f873d3098f7ca6ac1d0d0b032a348fc26f00ce010402befac0db5a958f0ddab41ae0eac8dae04a
+  metadata.gz: '07824b2bb5850ba139bea24ea65082c602e6e56ea79903a3645ce90d64ff1614e35eeee52ce1dae68670d688be6c9aaec577eab283ac4efb5fcfc4d9da23af1b'
+  data.tar.gz: a3d4f536ad36b3bf666183a607f2ba06a8bbfe9806e2e1917db30b65ec900a808fd69977587df44622e71f9a9ebce3363581c9cc689992f0fa8aac815457f93d

data/lib/kitchen-vcenter/version.rb

@@ -20,5 +20,5 @@
 # The main kitchen-vcenter module
 module KitchenVcenter
   # The version of this version of test-kitchen we assume enterprises want.
-  VERSION = "2.7.8"
+  VERSION = "2.8.6"
 end

data/lib/kitchen/driver/vcenter.rb

@@ -20,8 +20,8 @@ require "vsphere-automation-cis"
 require "vsphere-automation-vcenter"
 require_relative "../../kitchen-vcenter/version"
 require_relative "../../support/clone_vm"
-require "securerandom"
-require "uri"
+require "securerandom" unless defined?(SecureRandom)
+require "uri" unless defined?(URI)
 
 # The main kitchen module
 module Kitchen
@@ -137,7 +137,7 @@ module Kitchen
         unless config[:folder].nil?
           config[:folder] = {
             name: config[:folder],
-            id: get_folder(config[:folder]),
+            id: get_folder(config[:folder], "VIRTUAL_MACHINE", datacenter),
           }
         end
 
@@ -335,13 +335,19 @@ module Kitchen
       #
       # @param [name] name is the name of the folder
       # @param [type] type is the type of the folder, one of VIRTUAL_MACHINE, DATACENTER, possibly other values
-      def get_folder(name, type = "VIRTUAL_MACHINE")
+      # @param [datacenter] datacenter is the datacenter of the folder
+      def get_folder(name, type = "VIRTUAL_MACHINE", datacenter = nil)
         folder_api = VSphereAutomation::VCenter::FolderApi.new(api_client)
-        folders = folder_api.list({ filter_names: name, filter_type: type }).value
+        parent_path, basename = File.split(name)
+        filter = { filter_names: basename, filter_type: type }
+        filter[:filter_datacenters] = datacenter if datacenter
+        filter[:filter_parent_folders] = get_folder(parent_path, type, datacenter) unless parent_path == "."
 
-        raise format("Unable to find folder: %s", name) if folders.empty?
+        folders = folder_api.list(filter).value
 
-        raise format("%s returned too many folders", name) if folders.length > 1
+        raise format("Unable to find folder: %s", basename) if folders.empty?
+
+        raise format("`%s` returned too many folders", basename) if folders.length > 1
 
         folders.first.folder
       end
@@ -377,7 +383,7 @@ module Kitchen
       #
       # @param [name] name is the name of the Cluster
       def get_cluster_id(name)
-        return nil if name.nil?
+        return if name.nil?
 
         cluster_api = VSphereAutomation::VCenter::ClusterApi.new(api_client)
         clusters = cluster_api.list({ filter_names: name }).value

data/lib/support/clone_vm.rb

@@ -365,7 +365,7 @@ class Support
 
           disk_spec.device.controllerKey = controller.key
 
-          highest_id = vm.disks.map(&:unitNumber).sort.last
+          highest_id = vm.disks.map(&:unitNumber).max
           next_id = highest_id + idx + 1
 
           # Avoid the SCSI controller ID
@@ -425,7 +425,10 @@ class Support
     def find_datacenter
       vim.serviceInstance.find_datacenter(datacenter)
     rescue RbVmomi::Fault
-      root_folder.childEntity.grep(RbVmomi::VIM::Datacenter).find { |x| x.name == datacenter }
+      dc = root_folder.findByInventoryPath(datacenter)
+      return dc if dc.is_a?(RbVmomi::VIM::Datacenter)
+
+      raise Support::CloneError.new("Unable to locate datacenter at '#{datacenter}'")
     end
 
     def ip?(string)
@@ -440,18 +443,36 @@ class Support
         return false
       end
 
-      unless ip?(options[:guest_customization][:ip_address])
-        raise Support::CloneError.new("Guest customization error: ip_address is required to be formatted as an IPv4 address")
-      end
+      if options[:guest_customization][:ip_address]
+        unless ip?(options[:guest_customization][:ip_address])
+          raise Support::CloneError.new("Guest customization error: ip_address is required to be formatted as an IPv4 address")
+        end
 
-      unless ip?(options[:guest_customization][:subnet_mask])
-        raise Support::CloneError.new("Guest customization error: subnet_mask is required to be formatted as an IPv4 address")
+        unless options[:guest_customization][:subnet_mask]
+          raise Support::CloneError.new("Guest customization error: subnet_mask is required if assigning a fixed IPv4 address")
+        end
+
+        unless ip?(options[:guest_customization][:subnet_mask])
+          raise Support::CloneError.new("Guest customization error: subnet_mask is required to be formatted as an IPv4 address")
+        end
       end
 
-      options[:guest_customization][:gateway].each do |v|
-        unless ip?(v)
-          raise Support::CloneError.new("Guest customization error: gateway is required to be formatted as an IPv4 address")
+      if options[:guest_customization][:gateway]
+        unless options[:guest_customization][:gateway].is_a?(Array)
+          raise Support::CloneError.new("Guest customization error: gateway must be an array")
         end
+
+        options[:guest_customization][:gateway].each do |v|
+          unless ip?(v)
+            raise Support::CloneError.new("Guest customization error: gateway is required to be formatted as an IPv4 address")
+          end
+        end
+      end
+
+      required = %i{dns_domain timezone dns_server_list dns_suffix_list}
+      missing = required - options[:guest_customization].keys
+      unless missing.empty?
+        raise Support::CloneError.new("Guest customization error: #{missing.join(", ")} are required to support guest customization")
       end
 
       options[:guest_customization][:dns_server_list].each do |v|
@@ -460,19 +481,27 @@ class Support
         end
       end
 
-      unless %i{dns_domain timezone dns_server_list dns_suffix_list ip_address gateway subnet_mask}.all? { |k| options[:guest_customization].key? k }
-        raise Support::CloneError.new("Guest customization error: currently all options are required to support guest customization")
-      end
-
       if !options[:guest_customization][:dns_server_list].is_a?(Array)
         raise Support::CloneError.new("Guest customization error: dns_server_list must be an array")
       elsif !options[:guest_customization][:dns_suffix_list].is_a?(Array)
         raise Support::CloneError.new("Guest customization error: dns_suffix_list must be an array")
-      elsif !options[:guest_customization][:gateway].is_a?(Array)
-        raise Support::CloneError.new("Guest customization error: gateway must be an array")
       end
 
-      spec = RbVmomi::VIM::CustomizationSpec.new(
+      if options[:guest_customization][:ip_address]
+        customized_ip = RbVmomi::VIM::CustomizationIPSettings.new(
+          ip: RbVmomi::VIM::CustomizationFixedIp(ipAddress: options[:guest_customization][:ip_address]),
+          gateway: options[:guest_customization][:gateway],
+          subnetMask: options[:guest_customization][:subnet_mask],
+          dnsDomain: options[:guest_customization][:dns_domain]
+        )
+      else
+        customized_ip = RbVmomi::VIM::CustomizationIPSettings.new(
+          ip: RbVmomi::VIM::CustomizationDhcpIpGenerator.new,
+          dnsDomain: options[:guest_customization][:dns_domain]
+        )
+      end
+
+      RbVmomi::VIM::CustomizationSpec.new(
         identity: RbVmomi::VIM::CustomizationLinuxPrep.new(
           domain: options[:guest_customization][:dns_domain],
           hostName: RbVmomi::VIM::CustomizationFixedName.new(
@@ -486,18 +515,9 @@ class Support
           dnsSuffixList: options[:guest_customization][:dns_suffix_list]
         ),
         nicSettingMap: [RbVmomi::VIM::CustomizationAdapterMapping.new(
-          adapter: RbVmomi::VIM::CustomizationIPSettings.new(
-            ip: RbVmomi::VIM::CustomizationFixedIp(
-            ipAddress: options[:guest_customization][:ip_address]
-          ),
-            gateway: options[:guest_customization][:gateway],
-            subnetMask: options[:guest_customization][:subnet_mask],
-            dnsDomain: options[:guest_customization][:dns_domain]
-          )
+          adapter: customized_ip
         )]
       )
-
-      spec
     end
 
     def clone

data/lib/support/guest_operations.rb

@@ -1,5 +1,5 @@
 require "rbvmomi"
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 
 class Support
   # Encapsulate VMware Tools GOM interaction, inspired by github:dnuffer/raidopt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcenter
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.8.6
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi