kitchen-vcenter 2.11.4 → 2.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28119d22d4b763e0ddbe3bcacc0fdf119e7d477a78aaab050dd0433a6656935e
-  data.tar.gz: 0d4ebe88e1dd7c970729c426c4b5eb19d5319a8c048ef5db1c705835efbb4a1a
+  metadata.gz: 2814ca94153dd996897c1d357d2f538f07e699f47798d6bf8ca34b04d501ed8f
+  data.tar.gz: d1174b70520da7fcb424089ffc06928ef5bb272535640cad62cea16bca8d79cb
 SHA512:
-  metadata.gz: f5bf290eee4065039cd41a3b2fb74f6cdf3d6b3caf1b82b78353c84bf1e28fb69c04e029ec22327f8bc2ae0b3a60a01d60f14801c4dbf14f54b6d291b468774b
-  data.tar.gz: 54a3d86d39d3aa303097eab94f898d2ff015bf33af1ee2af18b2c75c8f7064f46e5b44fe13d040529321f30f44c08cb9bf64a0305c9bdace988fa6394b6ddc6d
+  metadata.gz: 12002adacfb368da1769950918f716a78b2b0a5533889d6541d473104572882c77ff0d2b48cfb16539eaf6ea027069de552e3c7e10e2ddf8782780c5ca8aa602
+  data.tar.gz: 3ff08fe608203a098b0b944e278c99c693a902cca9fcdc50154d25603ee515a755931aaedd2c99969bd55eaeaa4cfdd59451bdf5ec2823880862344435da423d

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.4"
+  VERSION = "2.11.12"
 end

data/lib/support/clone_vm.rb

@@ -173,6 +173,14 @@ class Support
       options[:vm_os].downcase.to_sym == :linux
     end
 
+    def update_network?(network_device)
+      options[:network_name] && network_device
+    end
+
+    def add_network?(network_device)
+      options[:network_name] && network_device.nil?
+    end
+
     def network_device(vm)
       all_network_devices = vm.config.hardware.device.select do |device|
         device.is_a?(RbVmomi::VIM::VirtualEthernetCard)
@@ -463,6 +471,82 @@ class Support
       ))
     end
 
+    # This method will fetch the network which is configured in the kitchen.yml file with
+    # network_name configuration.
+    # If there are multiple networks with the same name, first one will be used.
+    #
+    # @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?
+
+      if networks.count > 1
+        Kitchen.logger.warn(
+          format("Found %d networks named %s, picking first one", networks.count, options[:network_name])
+        )
+      end
+      networks.first
+    end
+
+    # This is a helper method that can be used to create the deviceChange spec which can be used
+    # 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)
+      if network_obj.is_a? RbVmomi::VIM::DistributedVirtualPortgroup
+        Kitchen.logger.info format("Assigning network %s...", network_obj.pretty_path)
+
+        vds_obj = network_obj.config.distributedVirtualSwitch
+        Kitchen.logger.info format("Using vDS '%s' for network connectivity...", vds_obj.name)
+
+        network_device.backing = RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(
+          port: RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
+            portgroupKey: network_obj.key,
+            switchUuid: vds_obj.uuid
+          )
+        )
+      elsif network_obj.is_a? RbVmomi::VIM::Network
+        Kitchen.logger.info format("Assigning network %s...", options[:network_name])
+
+        network_device.backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(
+          deviceName: options[:network_name]
+        )
+      else
+        raise Support::CloneError, format("Unknown network type %s for network name %s", network_obj.class.to_s, options[:network_name])
+      end
+
+      [
+        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],
+        }
+      )
+
+      config_spec = RbVmomi::VIM.VirtualMachineConfigSpec(
+        {
+          deviceChange: network_change_spec(network_device, network_obj, operation: :add),
+        }
+      )
+
+      task = vm.ReconfigVM_Task(spec: config_spec)
+      task.wait_for_completion
+    end
+
     def clone
       benchmark_start if benchmark?
 
@@ -507,47 +591,15 @@ class Support
       network_device = network_device(src_vm)
       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
 
-      unless network_device.nil? || options[:network_name].nil?
-        networks = dc.network.select { |n| n.name == options[:network_name] }
-        raise Support::CloneError.new(format("Could not find network named %s", options[:network_name])) if networks.empty?
-
-        Kitchen.logger.warn format("Found %d networks named %s, picking first one", networks.count, options[:network_name]) if networks.count > 1
-        network_obj = networks.first
-
-        if network_obj.is_a? RbVmomi::VIM::DistributedVirtualPortgroup
-          Kitchen.logger.info format("Assigning network %s...", network_obj.pretty_path)
-
-          vds_obj = network_obj.config.distributedVirtualSwitch
-          Kitchen.logger.info format("Using vDS '%s' for network connectivity...", vds_obj.name)
-
-          network_device.backing = RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(
-            port: RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
-              portgroupKey: network_obj.key,
-              switchUuid: vds_obj.uuid
-            )
-          )
-        elsif network_obj.is_a? RbVmomi::VIM::Network
-          Kitchen.logger.info format("Assigning network %s...", options[:network_name])
-
-          network_device.backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(
-            deviceName: options[:network_name]
-          )
-        else
-          raise Support::CloneError.new(format("Unknown network type %s for network name %s", network_obj.class.to_s, options[:network_name]))
-        end
-
-        relocate_spec.deviceChange = [
-          RbVmomi::VIM.VirtualDeviceConfigSpec(
-            operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation("edit"),
-            device: network_device
-          ),
-        ]
+      if update_network?(network_device)
+        network_obj = fetch_network(dc)
+        relocate_spec.deviceChange = network_change_spec(network_device, network_obj)
       end
 
       # Set the folder to use
       dest_folder = options[:folder].nil? ? dc.vmFolder : options[:folder][:id]
 
-      Kitchen.logger.info format("Cloning '%s' to create the VM...", options[:template])
+      Kitchen.logger.info format("Cloning '%s' to create the %s VM...", options[:template], vm_name)
       if instant_clone?
         vcenter_data = vim.serviceInstance.content.about
         raise Support::CloneError.new("Instant clones only supported with vCenter 6.7 or higher") unless vcenter_data.version.to_f >= 6.7
@@ -626,6 +678,8 @@ class Support
 
       vm_customization if options[:vm_customization]
 
+      add_new_network_device(dc) if add_network?(network_device)
+
       # 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?
         task = vm.PowerOnVM_Task

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcenter
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.12
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping