kitchen-vcenter 2.7.9 → 2.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8386b994051575b7997042ebd3c818de171a8de1ca34a39e13672800b986f216
-  data.tar.gz: 611d99f79e9d90ba850b1b0f04f126f3ca8acbb7c5000861c2d32310602f8f63
+  metadata.gz: 7085ec77febee812284fdba85d1002f2f1d6bae3ee1e02a7f264efb761217a30
+  data.tar.gz: df5e365f5821f623f7d8328ed7381ad710d9a62534970102fce3a4600195917b
 SHA512:
-  metadata.gz: 678e749a5da30a917227c6f057836177b0a70a7f2d3b79a5272b76ee1a26aa33191234fd31211a43d31e4137e1c6184c6b2307d7a75658bcd5e944214a4cf523
-  data.tar.gz: adf8a44b1a88c6274e1ee7070c7055b203fb033ebffb6723476fc3db6abfd6a8660fc16693a0cae8f4419bef34e550bc75de5a3c99a903f90e34b81bc252a531
+  metadata.gz: 744634197d4ba4c19fb461226f42afbbca219e77054829ba5cb3a7a2b1b7cd10c29d94a3bb1416b840b04dc26bd5a6ba3a1dffa2827c3af9009f9f67130a3eb3
+  data.tar.gz: 389178a1c61df997e790cc06cbb3a3d5ae7aa7d6303e946f5cf8ef7499fe65003a6419d7f1a120d6c0da99d3f524b68cdf4dae6e1ee2beab5929a2d47ae5f945

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.9"
+  VERSION = "2.7.12"
 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

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.9
+  version: 2.7.12
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi