kitchen-vcenter 2.11.12 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2814ca94153dd996897c1d357d2f538f07e699f47798d6bf8ca34b04d501ed8f
-  data.tar.gz: d1174b70520da7fcb424089ffc06928ef5bb272535640cad62cea16bca8d79cb
+  metadata.gz: e78c67ec9092a28c7a0c4ca7c58f480c8f712b6c8cefcbd6e114fbe337d6ea15
+  data.tar.gz: 0bd6b279c05a22f489c0fb5a7c7dde3de1c06aeaa0b0eb08793c756e59aaa8bf
 SHA512:
-  metadata.gz: 12002adacfb368da1769950918f716a78b2b0a5533889d6541d473104572882c77ff0d2b48cfb16539eaf6ea027069de552e3c7e10e2ddf8782780c5ca8aa602
-  data.tar.gz: 3ff08fe608203a098b0b944e278c99c693a902cca9fcdc50154d25603ee515a755931aaedd2c99969bd55eaeaa4cfdd59451bdf5ec2823880862344435da423d
+  metadata.gz: a636d115b71f1fb65dbc607c41b20c09f39b975d3b6c8ce2d60fd2aaa93f5c98a0f0f058ba1b8179e5e7db0f6dca8812c141438469430e2ee5e00edb7e827719
+  data.tar.gz: dbe33aabab07e01a092da7215e25a718a4c74cdeba037c59a5164ef552221b2df69f45a053e17d4e8b53c88cafad0ff95fc3743d446973a4d8fb782350d94858

data/lib/kitchen/driver/vcenter.rb

@@ -56,6 +56,7 @@ module Kitchen
       default_config :clone_type, :full
       default_config :cluster, nil
       default_config :network_name, nil
+      default_config :networks, []
       default_config :tags, nil
       default_config :vm_wait_timeout, 90
       default_config :vm_wait_interval, 2.0
@@ -94,6 +95,11 @@ module Kitchen
         The `customize` setting was renamed to `vm_customization` and will
         be removed in future versions.
       MSG
+      deprecate_config_for :network_name, Util.outdent!(<<-MSG)
+        The `network_name` setting is deprecated and will be removed in the
+        future version. Please use the new settings `networks` and refer
+        documentation for the usage.
+      MSG
 
       # The main create method
       #
@@ -145,7 +151,7 @@ module Kitchen
         config[:targethost] = get_host(config[:targethost], datacenter, cluster_id)
 
         # Check if network exists, if to be changed
-        network_exists?(config[:network_name]) unless config[:network_name].nil?
+        config[:networks].each { |network| network_exists?(network[:name]) }
 
         # Same thing needs to happen with the folder name if it has been set
         unless config[:folder].nil?
@@ -172,7 +178,7 @@ module Kitchen
           folder: config[:folder],
           resource_pool: config[:resource_pool],
           clone_type: config[:clone_type].to_sym,
-          network_name: config[:network_name],
+          networks: config[:networks],
           interface: config[:interface],
           wait_timeout: config[:vm_wait_timeout],
           wait_interval: config[:vm_wait_interval],
@@ -286,6 +292,13 @@ module Kitchen
         config[:vm_username] = config[:aggressive_username] unless config[:aggressive_username].nil?
         config[:vm_password] = config[:aggressive_password] unless config[:aggressive_password].nil?
         config[:vm_customization] = config[:customize] unless config[:customize].nil?
+        validate_network_parameters
+      end
+
+      def validate_network_parameters
+        return if config[:network_name].nil?
+
+        config[:networks] = [{ name: config[:network_name], operation: "edit" }]
       end
 
       # A helper method to validate the state

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.11.12"
+  VERSION = "2.12.0"
 end

data/lib/support/clone_vm.rb

@@ -173,12 +173,37 @@ class Support
       options[:vm_os].downcase.to_sym == :linux
     end
 
+    # Network configured to update the existing one in the template
+    #
+    def networks_to_update
+      options[:networks].select { |n| n[:operation] == "edit" }
+    end
+
+    # New networks that needs to be attached to newly created vm
+    #
+    def networks_to_add
+      options[:networks].select { |n| [nil, "add"].include?(n[:operation]) }
+    end
+
+    # A network should update if there is a network_device available in the template
+    # and the user configured a new network with edit operation.
+    #
     def update_network?(network_device)
-      options[:network_name] && network_device
+      networks_to_update.any? && network_device
     end
 
-    def add_network?(network_device)
-      options[:network_name] && network_device.nil?
+    # Checks whether any networks configured for addition
+    def add_network?
+      networks_to_add.any?
+    end
+
+    # TODO: Remove this method and its invocations after the deprecation of `network_name` config
+    # For backward compatibility
+    # If the template doesn't have any NIC and the user use the old
+    # configuration(network_name), then that network should be attached to the vm.
+    #
+    def attach_new_network?(network_device)
+      network_device.nil? && networks_to_update.any?
     end
 
     def network_device(vm)
@@ -477,13 +502,13 @@ class Support
     #
     # @return Network object
     #
-    def fetch_network(datacenter)
-      networks = datacenter.network.select { |n| n.name == options[:network_name] }
-      raise Support::CloneError, format("Could not find network named %s", options[:network_name]) if networks.empty?
+    def fetch_network(datacenter, network_name)
+      networks = datacenter.network.select { |n| n.name == network_name }
+      raise Support::CloneError, format("Could not find network named %s", network_name) if networks.empty?
 
       if networks.count > 1
         Kitchen.logger.warn(
-          format("Found %d networks named %s, picking first one", networks.count, options[:network_name])
+          format("Found %d networks named %s, picking first one", networks.count, network_name)
         )
       end
       networks.first
@@ -493,7 +518,7 @@ class Support
     # to add a new network device or update the existing network device
     #
     # The network_obj will be used as a backing for the network_device.
-    def network_change_spec(network_device, network_obj, operation: :edit)
+    def network_change_spec(network_device, network_obj, network_name, operation: :edit)
       if network_obj.is_a? RbVmomi::VIM::DistributedVirtualPortgroup
         Kitchen.logger.info format("Assigning network %s...", network_obj.pretty_path)
 
@@ -507,39 +532,42 @@ class Support
           )
         )
       elsif network_obj.is_a? RbVmomi::VIM::Network
-        Kitchen.logger.info format("Assigning network %s...", options[:network_name])
+        Kitchen.logger.info format("Assigning network %s...", network_name)
 
         network_device.backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(
-          deviceName: options[:network_name]
+          deviceName: network_name
         )
       else
-        raise Support::CloneError, format("Unknown network type %s for network name %s", network_obj.class.to_s, options[:network_name])
+        raise Support::CloneError, format("Unknown network type %s for network name %s", network_obj.class.to_s, network_name)
       end
 
-      [
-        RbVmomi::VIM.VirtualDeviceConfigSpec(
-          operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation(operation),
-          device: network_device
-        ),
-      ]
+      RbVmomi::VIM.VirtualDeviceConfigSpec(
+        operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation(operation),
+        device: network_device
+      )
     end
 
     # This method can be used to add new network device to the target vm
     # This fill find the network which defined in kitchen.yml in network_name configuration
     # and attach that to the target vm.
-    def add_new_network_device(datacenter)
-      network_obj = fetch_network(datacenter)
-      network_device = RbVmomi::VIM.VirtualVmxnet3(
-        key: 0,
-        deviceInfo: {
-          label: options[:network_name],
-          summary: options[:network_name],
-        }
-      )
+    def add_new_network_device(datacenter, networks)
+      device_change = []
+      networks.each do |network|
+        network_obj = fetch_network(datacenter, network[:name])
+        network_device = RbVmomi::VIM.VirtualVmxnet3(
+          key: 0,
+          deviceInfo: {
+            label: network[:name],
+            summary: network[:name],
+          }
+        )
+
+        device_change << network_change_spec(network_device, network_obj, network[:name], operation: :add)
+      end
 
       config_spec = RbVmomi::VIM.VirtualMachineConfigSpec(
         {
-          deviceChange: network_change_spec(network_device, network_obj, operation: :add),
+          deviceChange: device_change,
         }
       )
 
@@ -592,8 +620,12 @@ class Support
       Kitchen.logger.warn format("Source VM/template does not have any network device (use VMware IPPools and vsphere-gom transport or govc to access)") unless network_device
 
       if update_network?(network_device)
-        network_obj = fetch_network(dc)
-        relocate_spec.deviceChange = network_change_spec(network_device, network_obj)
+        network_spec = []
+        networks_to_update.each do |network|
+          network_obj = fetch_network(dc, network[:name])
+          network_spec << network_change_spec(network_device, network_obj, network[:name])
+        end
+        relocate_spec.deviceChange = network_spec
       end
 
       # Set the folder to use
@@ -678,7 +710,10 @@ class Support
 
       vm_customization if options[:vm_customization]
 
-      add_new_network_device(dc) if add_network?(network_device)
+      # TODO: Remove this line after the deprecation of `network_name` config
+      add_new_network_device(dc, networks_to_update) if attach_new_network?(network_device)
+
+      add_new_network_device(dc, networks_to_add) if add_network?
 
       # Start only if specified or customizations wanted; no need for instant clones as they start in running state
       if options[:poweron] && !options[:vm_customization].nil? && !instant_clone?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcenter
 version: !ruby/object:Gem::Version
-  version: 2.11.12
+  version: 2.12.0
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -31,12 +31,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rbvmomi
+  name: rbvmomi2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 3.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 3.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="