kitchen-vcenter 2.11.0 → 2.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67058560fd24551eec490d96384db30c85da728655bde6495320c142582b82db
-  data.tar.gz: 3b7d9ff608825c060e51bcbc1937848d7a3764435898d28e031d5a49f22006a9
+  metadata.gz: 0531d4a30ba60e32b1f7a86df17e1dcf1caa611b5c9cd87372fb4364cb19fa48
+  data.tar.gz: a20d1df383cbfb37faf41fd2c85166f394bd37200a0f29bece61270037557a0a
 SHA512:
-  metadata.gz: 51483886c3582d2761ec89033a452ee2c369bace2f0ede2d89d3b9000656190a368775b27a3620ede8948f8913af6fa5b0062f84998361f0034353953d6ef5f1
-  data.tar.gz: 4e3ebba36a422d3e5b7a8a5692e825fa78e79735755f2015ee3db2bd92955c5984ec515e341ec6dc04eb622cc298b05ace2b0f090c4d7b203b6dcc5ae36a3a4e
+  metadata.gz: b41c0ebc3486ff91b56bfce5ef3e219554a53e5a491f74da60cae4d0df45dca22ef172b95ee2d712ea59d3d10cac39e075c4e192604a53b61dd9c02f7de7a4fe
+  data.tar.gz: e7dca5a3b4ff2f93e9a78cab79361b48015f43a652784dd4ccf705a446c5e314aa4af35a0bf80fb396804522289f457075b2eadffb3a7c2a5c91a0e9413f7c4d

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.0"
+  VERSION = "2.11.9"
 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)
@@ -184,6 +192,8 @@ class Support
 
     def reconnect_network_device(vm)
       network_device = network_device(vm)
+      return unless network_device
+
       network_device.connectable = RbVmomi::VIM.VirtualDeviceConnectInfo(
         allowGuestControl: true,
         startConnected: true,
@@ -461,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?
 
@@ -502,42 +588,12 @@ class Support
       relocate_spec.pool = options[:resource_pool]
 
       # Change network, if wanted
-      unless 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
-        network_device = network_device(src_vm)
-
-        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 = 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
 
-          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
@@ -572,19 +628,20 @@ class Support
         # MAC at least with 6.7.0 build 9433931
 
         # Disconnect network device, so wo don't get IP collisions on start
-        network_device = network_device(src_vm)
-        network_device.connectable = RbVmomi::VIM.VirtualDeviceConnectInfo(
-          allowGuestControl: true,
-          startConnected: true,
-          connected: false,
-          migrateConnect: "disconnect"
-        )
-        relocate_spec.deviceChange = [
-          RbVmomi::VIM.VirtualDeviceConfigSpec(
-            operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation("edit"),
-            device: network_device
-          ),
-        ]
+        if network_device
+          network_device.connectable = RbVmomi::VIM.VirtualDeviceConnectInfo(
+            allowGuestControl: true,
+            startConnected: true,
+            connected: false,
+            migrateConnect: "disconnect"
+          )
+          relocate_spec.deviceChange = [
+            RbVmomi::VIM.VirtualDeviceConfigSpec(
+              operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation("edit"),
+              device: network_device
+            ),
+          ]
+        end
 
         clone_spec = RbVmomi::VIM.VirtualMachineInstantCloneSpec(location: relocate_spec,
                                                                  name: vm_name)
@@ -621,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.0
+  version: 2.11.9
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="