kitchen-vcenter 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f49e8fc98358fba0a3d791d90cd7114dca3ebea36114c78243bd8290198660c
-  data.tar.gz: d495c5cac6372f7afa189c27d6e7079c2bfc69b73bf5ff4ec82d6f4d02fdf4b8
+  metadata.gz: 31833a2dfb60dba469a3c03aa8261cc4639760770cb33b913909950009e5603b
+  data.tar.gz: c0c663f9b4ac33fdc505dab121ba33112d22b7cc9df59213a1aa1858c1191aa4
 SHA512:
-  metadata.gz: 79182163a7adc1acf518959674e4c07833ba83e5e7de7ce46805887c68b998d9987a087c0e0897b14c0d6042df66620445091d742569e56de122fde30c770a23
-  data.tar.gz: bdd5b03a192e3e71ff84017ffcd7ffa2314e4eef3bd82042c8822f18688061aba854951f0ab524ab5468756e2e87a63f9eed0996f5ac8aee5e3c4d3ae7e343b0
+  metadata.gz: 4c5ef3e005c6f281b651c197a46a1bb84d38c3261973d5dc909d1924afd398a8c4debc2746f0de3f84d5e2dcd294a3e0537fb8df4210733abd9e7eb94ff9a40c
+  data.tar.gz: 66bc5bcb9263cbd8ab91757555f32daa26b0b2148c792ab1dd62613053bab7efdfa83673d6afbcc0e97621b393d7fb2f3339b853856f958d158f718cc16f43af

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 = "1.4.2"
+  VERSION = "1.5.0"
 end

data/lib/kitchen/driver/vcenter.rb

@@ -24,6 +24,7 @@ require "base"
 require "lookup_service_helper"
 require "vapi"
 require "com/vmware/cis"
+require "com/vmware/cis/tagging"
 require "com/vmware/vcenter"
 require "com/vmware/vcenter/vm"
 require "support/clone_vm"
@@ -53,27 +54,14 @@ module Kitchen
       default_config :clone_type, :full
       default_config :cluster, nil
       default_config :lookup_service_host, nil
+      default_config :network_name, nil
+      default_config :tags, nil
 
       # The main create method
       #
       # @param [Object] state is the state of the vm
       def create(state)
-        # Configure the hash for use when connecting for cloning a machine
-        @connection_options = {
-          user: config[:vcenter_username],
-          password: config[:vcenter_password],
-          insecure: config[:vcenter_disable_ssl_verify] ? true : false,
-          host: config[:vcenter_host],
-          rev: config[:clone_type] == "instant" ? "6.7" : nil,
-        }
-
-        # If the vm_name has not been set then set it now based on the suite, platform and a random number
-        if config[:vm_name].nil?
-          config[:vm_name] = format("%s-%s-%s", instance.suite.name, instance.platform.name, SecureRandom.hex(4))
-        end
-
-        raise format("Cannot specify both cluster and resource_pool") if !config[:cluster].nil? && !config[:resource_pool].nil?
-
+        save_and_validate_parameters
         connect
 
         # Using the clone class, create a machine for TK
@@ -94,6 +82,9 @@ module Kitchen
         # Check that the datacenter exists
         datacenter_exists?(config[:datacenter])
 
+        # Check if network exists, if to be changed
+        network_exists?(config[:network_name]) unless config[:network_name].nil?
+
         # Same thing needs to happen with the folder name if it has been set
         unless config[:folder].nil?
           config[:folder] = {
@@ -116,12 +107,35 @@ module Kitchen
           folder: config[:folder],
           resource_pool: config[:resource_pool],
           clone_type: config[:clone_type],
+          network_name: config[:network_name],
         }
 
         # Create an object from which the clone operation can be called
         clone_obj = Support::CloneVm.new(connection_options, options)
         state[:hostname] = clone_obj.clone
         state[:vm_name] = config[:vm_name]
+
+        unless config[:tags].nil? || config[:tags].empty?
+          valid_tags = {}
+          vm_tags = Com::Vmware::Cis::Tagging::Tag.new(vapi_config)
+          vm_tags.list.each do |uid|
+            tag = vm_tags.get(uid)
+            valid_tags[tag.name] = tag.id
+          end
+
+          # Error out on undefined tags
+          invalid = config[:tags] - valid_tags.keys
+          raise format("Specified tag(s) %s not valid", invalid.join(",")) unless invalid.empty?
+
+          tag_service = Com::Vmware::Cis::Tagging::TagAssociation.new(vapi_config)
+
+          # calls needs a DynamicID object which we construct from type and mobID
+          mobid = get_vm(config[:vm_name]).vm
+          dynamic_id = Com::Vmware::Vapi::Std::DynamicID.new(type: "VirtualMachine", id: mobid)
+
+          tag_ids = config[:tags].map { |name| valid_tags[name] }
+          tag_service.attach_multiple_tags_to_object(dynamic_id, tag_ids)
+        end
       end
 
       # The main destroy method
@@ -130,6 +144,7 @@ module Kitchen
       def destroy(state)
         return if state[:vm_name].nil?
 
+        save_and_validate_parameters
         connect
         vm = get_vm(state[:vm_name])
 
@@ -147,6 +162,26 @@ module Kitchen
 
       private
 
+      # Helper method for storing and validating configuration parameters
+      #
+      def save_and_validate_parameters
+        # Configure the hash for use when connecting for cloning a machine
+        @connection_options = {
+          user: config[:vcenter_username],
+          password: config[:vcenter_password],
+          insecure: config[:vcenter_disable_ssl_verify] ? true : false,
+          host: config[:vcenter_host],
+          rev: config[:clone_type] == "instant" ? "6.7" : nil,
+        }
+
+        # If the vm_name has not been set then set it now based on the suite, platform and a random number
+        if config[:vm_name].nil?
+          config[:vm_name] = format("%s-%s-%s", instance.suite.name, instance.platform.name, SecureRandom.hex(4))
+        end
+
+        raise format("Cannot specify both cluster and resource_pool") if !config[:cluster].nil? && !config[:resource_pool].nil?
+      end
+
       # A helper method to validate the state
       #
       # @param [Object] state is the state of the vm
@@ -167,6 +202,17 @@ module Kitchen
         raise format("Unable to find data center: %s", name) if dc.empty?
       end
 
+      # Checks if a network exists or not
+      #
+      # @param [name] name is the name of the Network
+      def network_exists?(name)
+        net_obj = Com::Vmware::Vcenter::Network.new(vapi_config)
+        filter = Com::Vmware::Vcenter::Network::FilterSpec.new(names: Set.new([name]))
+        net = net_obj.list(filter)
+
+        raise format("Unable to find target network: %s", name) if net.empty?
+      end
+
       # Validates the host name of the server you can connect to
       #
       # @param [name] name is the name of the host

data/lib/support/clone_vm.rb

@@ -14,8 +14,11 @@ class Support
     def clone
       # set the datacenter name
       dc = vim.serviceInstance.find_datacenter(options[:datacenter])
-      src_vm = dc.find_vm(options[:template])
 
+      # reference template using full inventory path
+      root_folder = @vim.serviceInstance.content.rootFolder
+      inventory_path = format("/%s/vm/%s", options[:datacenter], options[:template])
+      src_vm = root_folder.findByInventoryPath(inventory_path)
       raise format("Unable to find template: %s", options[:template]) if src_vm.nil?
 
       # Specify where the machine is going to be created
@@ -30,8 +33,28 @@ class Support
       # Set the resource pool
       relocate_spec.pool = options[:resource_pool]
 
+      # Change network, if wanted
+      unless options[:network_name].nil?
+        all_network_devices = src_vm.config.hardware.device.select do |device|
+          device.is_a?(RbVmomi::VIM::VirtualEthernetCard)
+        end
+
+        # Only support for first NIC so far
+        network_device = all_network_devices.first
+        network_device.backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(
+          deviceName: options[:network_name]
+        )
+
+        relocate_spec.deviceChange = [
+          RbVmomi::VIM.VirtualDeviceConfigSpec(
+            operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation("edit"),
+            device: network_device
+          )
+        ]
+      end
+
       # Set the folder to use
-      dest_folder = options[:folder].nil? ? src_vm.parent : options[:folder][:id]
+      dest_folder = options[:folder].nil? ? dc.vmFolder : options[:folder][:id]
 
       puts "Cloning '#{options[:template]}' to create the VM..."
       if options[:clone_type] == :instant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcenter
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
-- Russell Seymour
+- Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -96,7 +96,7 @@ dependencies:
         version: '0'
 description: Test Kitchen driver for VMware vCenter using SDK
 email:
-- russell@chef.io
+- oss@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []