kitchen-vcenter 2.7.12 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7085ec77febee812284fdba85d1002f2f1d6bae3ee1e02a7f264efb761217a30
-  data.tar.gz: df5e365f5821f623f7d8328ed7381ad710d9a62534970102fce3a4600195917b
+  metadata.gz: f3fb477d8c5d39ca1340bb9593fbbbfcd54d3fceb477f6aeb996f92bd0c62897
+  data.tar.gz: fe45e70e975a4a26e87f92c3ce46d844993c954bfcd41c9dc9808229aadb1ec2
 SHA512:
-  metadata.gz: 744634197d4ba4c19fb461226f42afbbca219e77054829ba5cb3a7a2b1b7cd10c29d94a3bb1416b840b04dc26bd5a6ba3a1dffa2827c3af9009f9f67130a3eb3
-  data.tar.gz: 389178a1c61df997e790cc06cbb3a3d5ae7aa7d6303e946f5cf8ef7499fe65003a6419d7f1a120d6c0da99d3f524b68cdf4dae6e1ee2beab5929a2d47ae5f945
+  metadata.gz: fe27bc6dc42e1ccfbcb8593281337b8aa5f7c20eae4c7a66a63887daef0d6be6d31ce82ef82e91cc90cf9e297ea3a096999ed00801737919879341e623d489c8
+  data.tar.gz: cf02a3623872e75f65bbe7a106ed616bf50f705fcbf39bdd36d7d5c4c88a2335f872075ce88736df4587536c2dccce09a3feeff3d8431cf9091dc329e829638b

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.12"
+  VERSION = "2.8.0"
 end

data/lib/support/clone_vm.rb

@@ -440,18 +440,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,16 +478,24 @@ 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
+
+      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(
@@ -486,14 +512,7 @@ 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
         )]
       )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcenter
 version: !ruby/object:Gem::Version
-  version: 2.7.12
+  version: 2.8.0
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi