kitchen-vcenter 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42c7852178bc1dcfc969a8bf7e425bd47dd69cc6bcf912c2e2448b8a98fac78d
-  data.tar.gz: 14f6e34a3f3ad7e9c8fe137b1266124a12af27a13d2527a4f4bebfc8b419bb2b
+  metadata.gz: be70461cce1a547dea1adf6f9e8d6455b1e8ac94cdc7b5fef4770dbc99e30351
+  data.tar.gz: 3fe4497e67f00349262f712c80d7ab9946348be345213eb69b51f484996ca39c
 SHA512:
-  metadata.gz: fd7aa018d79d571d67cb222df22146f12ab1e2c45e259afad4ada7569439adee363ba5972abe991139f3638850a4822bed5ce684d26dc0d22faee1fde426c277
-  data.tar.gz: 4d90cb4b2e62da501b0e047365086921f88001e2b48914f535c0cadff15412c77ab488bcd49bdd596283732c1227bcf44701581da783c3e043851bf711030f3c
+  metadata.gz: 1c2cc7a1372169dcd36e7806a51f7db5ea8b5f16402b2f7d618b4d0f137d537b6bd4d6a43b83339ebb7818315d753100eb1d424ee95c7764388c764d66a84728
+  data.tar.gz: 2ea80d7060c5360d35eb2e19f2e6e223a74138e3b08649f5c5594996f759ea16398485cf80c0c6d59305d14f4ff7ceac5cb51ebf93ce26209ab92956103db3b6

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.1.0"
+  VERSION = "2.2.1"
 end

data/lib/kitchen/driver/vcenter.rb

@@ -52,6 +52,7 @@ module Kitchen
       default_config :vm_wait_interval, 2.0
       default_config :vm_rollback, false
       default_config :customize, nil
+      default_config :interface, nil
 
       # The main create method
       #
@@ -118,6 +119,7 @@ module Kitchen
           resource_pool: config[:resource_pool],
           clone_type: config[:clone_type],
           network_name: config[:network_name],
+          interface: config[:interface],
           wait_timeout: config[:vm_wait_timeout],
           wait_interval: config[:vm_wait_interval],
           customize: config[:customize],

data/lib/support/clone_vm.rb

@@ -16,10 +16,25 @@ class Support
     def get_ip(vm)
       @ip = nil
 
+      # Don't simply use vm.guest.ipAddress to allow specifying a different interface
       unless vm.guest.net.empty? || !vm.guest.ipAddress
-        @ip = vm.guest.net[0].ipConfig.ipAddress.detect do |addr|
-          addr.origin != "linklayer"
-        end.ipAddress
+        nics = vm.guest.net
+        if options[:interface]
+          nics.select! { |nic| nic.network == options[:interface] }
+
+          raise format("No interfaces found on VM which are attached to network '%s'", options[:interface]) if nics.empty?
+        end
+
+        vm_ip = nil
+        nics.each do |net|
+          vm_ip = net.ipConfig.ipAddress.detect { |addr| addr.origin != "linklayer" }
+          break unless vm_ip.nil?
+        end
+
+        extended_msg = options[:interface] ? "Network #{options[:interface]}" : ""
+        raise format("No valid IP found on VM %s", extended_msg) if vm_ip.nil?
+
+        @ip = vm_ip.ipAddress
       end
 
       ip
@@ -167,7 +182,7 @@ class Support
         task.wait_for_completion
       end
 
-      if options[:poweron] && !options[:customize].nil?
+      if options[:poweron] && !options[:customize].nil? && options[:clone_type] != :instant
         task = vm.PowerOnVM_Task
         task.wait_for_completion
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcenter
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi