kitchen-vcenter 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d3bbb3c6bad4d1c38ef1fc4049a0363083e1bd7
-  data.tar.gz: e6e3e44a085fdb28159d4562130b73a860948e42
+  metadata.gz: 4ad83365e404c24b62793647a264cc753dcd8c39
+  data.tar.gz: 39add38626871f3a8720cd2bff7c28cdb904d56a
 SHA512:
-  metadata.gz: 8b96a21adbe30109d9991564f81eded1b0c647366df9631145c678aec30c73d5dd64c45428b4d715845c77ea07184f3b76d83c8cf3185812eb8a0b0e7b116830
-  data.tar.gz: 705e798243b0763f288a7d6938a5b3e1ca9461500c97ccc21c836d48f4ea99d30fe4d3b9fb21eb9aacf02abf699b0e29c3b58995e7c5dd94dd689ede96976b1d
+  metadata.gz: 9acb72a51bae96c57eff8b8b7074b132b22b3c07c28c1ad781d20e60a1ee2db173c3df65b420b290db929f54cc4b0e07e04dc5ef75a8a78f3d4ef0ff3c39c13b
+  data.tar.gz: 0c1b2ab4a0426c987047ab6843aa4f852604ecb2c068c4533b4d1c302dbaa509a4fad1875baa6376bfc69d7f9f4f4cf18832c53e225f066178e97b20916ba27d

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 
-## [1.0.0](https://github.com/chef/kitchen-vcenter/tree/1.0.0) (2017-08-10)
+## [1.1.0](https://github.com/chef/kitchen-vcenter/tree/1.1.0) (2017-09-07)
+[Full Changelog](https://github.com/chef/kitchen-vcenter/compare/v1.0.0...1.1.0)
+
+**Closed issues:**
+
+- Resource pool is not specified when creating a new machine [\#7](https://github.com/chef/kitchen-vcenter/issues/7)
+- Unhelpful messages from driver if specified item does not exist [\#6](https://github.com/chef/kitchen-vcenter/issues/6)
+
+**Merged pull requests:**
+
+- Updated to handle resource\_pools [\#8](https://github.com/chef/kitchen-vcenter/pull/8) ([russellseymour](https://github.com/russellseymour))
+
+## [v1.0.0](https://github.com/chef/kitchen-vcenter/tree/v1.0.0) (2017-08-28)
 **Merged pull requests:**
 
 - 1.0.0 release [\#4](https://github.com/chef/kitchen-vcenter/pull/4) ([jjasghar](https://github.com/jjasghar))

data/README.md

@@ -50,6 +50,7 @@ driver:
   driver_config:
     targethost: 172.16.20.41
     datacenter: "Datacenter"
+    resource_pool: "testkitchen"
 
 platforms:
   - name: ubuntu-1604
@@ -75,6 +76,7 @@ The following parameters should be set in the `driver_config` for the individual
  - `targethost` - Host on which the new virtual machine should be created
  - `template` - Template or virtual machine to use when cloning the new machine
  - `datacenter` - Name of the datacenter to use to deploy into
+ - `resource_pool` - Name of the resource pool to use when creating the machine. The resource pool _must_ already exist
 
 ### Optional Parameters
 

data/lib/kitchen-vcenter/version.rb

@@ -18,5 +18,5 @@
 #
 
 module KitchenVcenter
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/kitchen/driver/vcenter.rb

@@ -47,6 +47,7 @@ module Kitchen
       default_config :vcenter_disable_ssl_verify, false
       default_config :poweron, true
       default_config :vm_name, nil
+      default_config :resource_pool, nil
 
       def create(state)
         # If the vm_name has not been set then set it now based on the suite, platform and a random number
@@ -54,16 +55,24 @@ module Kitchen
           config[:vm_name] = format('%s-%s-%s', instance.suite.name, instance.platform.name, SecureRandom.hex(4))
         end
 
+        raise "Please set the resource pool name using `resource_pool` parameter in the 'drive_config' section of your .kitchen.yml file" if config[:resource_pool].nil?
+
         connect
 
         # Using the clone class, create a machine for TK
         # Find the identifier for the targethost to pass to rbvmomi
         config[:targethost] = get_host(config[:targethost])
 
+        # Find the resource pool
+        config[:resource_pool] = get_resource_pool(config[:resource_pool])
+
+        # Check that the datacenter exists
+        datacenter_exists?(config[:datacenter])
+
         # Same thing needs to happen with the folder name if it has been set
         config[:folder] = {
           name: config[:folder],
-          id: get_folder(config[:folder])
+          id: get_folder(config[:folder]),
         } unless config[:folder].nil?
 
         # Create a hash of options that the clone requires
@@ -73,7 +82,8 @@ module Kitchen
           poweron: config[:poweron],
           template: config[:template],
           datacenter: config[:datacenter],
-          folder: config[:folder]
+          folder: config[:folder],
+          resource_pool: config[:resource_pool],
         }
 
         # Create an object from which the clone operation can be called
@@ -90,7 +100,7 @@ module Kitchen
         vm_obj = Com::Vmware::Vcenter::VM.new(vapi_config)
 
         # shut the machine down if it is running
-        if vm.power_state.value == "POWERED_ON"
+        if vm.power_state.value == 'POWERED_ON'
           power = Com::Vmware::Vcenter::Vm::Power.new(vapi_config)
           power.stop(vm.vm)
         end
@@ -102,36 +112,59 @@ module Kitchen
       private
 
       def validate_state(state = {})
-
       end
 
       def existing_state_value?(state, property)
         state.key?(property) && !state[property].nil?
       end
 
+      def datacenter_exists?(name)
+        filter = Com::Vmware::Vcenter::Datacenter::FilterSpec.new(names: Set.new([name]))
+        dc_obj = Com::Vmware::Vcenter::Datacenter.new(vapi_config)
+        dc = dc_obj.list(filter)
+
+        raise format('Unable to find data center: %s', name) if dc.empty?
+      end
+
       def get_host(name)
-        filter = Com::Vmware::Vcenter::Host::FilterSpec.new({names: Set.new([name])})
+        filter = Com::Vmware::Vcenter::Host::FilterSpec.new(names: Set.new([name]))
         host_obj = Com::Vmware::Vcenter::Host.new(vapi_config)
-        host = host_obj.list
+        host = host_obj.list(filter)
+
+        raise format('Unable to find target host: %s', name) if host.empty?
+
         host[0].host
       end
 
       def get_folder(name)
         # Create a filter to ensure that only the named folder is returned
-        filter = Com::Vmware::Vcenter::Folder::FilterSpec.new({names: Set.new([name])})
+        filter = Com::Vmware::Vcenter::Folder::FilterSpec.new(names: Set.new([name]))
         # filter.names = name
         folder_obj = Com::Vmware::Vcenter::Folder.new(vapi_config)
         folder = folder_obj.list(filter)
 
+        raise format('Unable to find folder: %s', name) if folder.empty?
+
         folder[0].folder
       end
 
       def get_vm(name)
-        filter = Com::Vmware::Vcenter::VM::FilterSpec.new({names: Set.new([name])})
+        filter = Com::Vmware::Vcenter::VM::FilterSpec.new(names: Set.new([name]))
         vm_obj = Com::Vmware::Vcenter::VM.new(vapi_config)
         vm_obj.list(filter)[0]
       end
 
+      def get_resource_pool(name)
+        # Create a filter to ensure that only the specified resource pool is returned, if it exists
+        filter = Com::Vmware::Vcenter::ResourcePool::FilterSpec.new(names: Set.new([name]))
+        rp_obj = Com::Vmware::Vcenter::ResourcePool.new(vapi_config)
+        resource_pool = rp_obj.list(filter)
+
+        raise format('Unable to find Resource Pool: %s', name) if resource_pool.empty?
+
+        resource_pool[0].resource_pool
+      end
+
       def connect
         # Configure the connection to vCenter
         lookup_service_helper = LookupServiceHelper.new(config[:vcenter_host])

data/lib/support/clone_vm.rb

@@ -12,35 +12,33 @@ class Support
     end
 
     def clone
-
       # set the datacenter name
       dc = vim.serviceInstance.find_datacenter(options[:datacenter])
       src_vm = dc.find_vm(options[:template])
-      hosts = dc.hostFolder.children
 
       # Specify where the machine is going to be created
       relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec
       relocate_spec.host = options[:targethost]
-      relocate_spec.pool = hosts.first.resourcePool
+      relocate_spec.pool = options[:resource_pool]
 
       clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(location: relocate_spec,
-                                                  powerOn: options[:poweron],
-                                                  template: false)
+                                                        powerOn: options[:poweron],
+                                                        template: false)
 
       # Set the folder to use
       dest_folder = options[:folder].nil? ? src_vm.parent : options[:folder][:id]
 
-      puts "Cloning the template #{options[:template]} to create the VM..."
+      puts "Cloning the template '#{options[:template]}' to create the VM..."
       task = src_vm.CloneVM_Task(folder: dest_folder, name: options[:name], spec: clone_spec)
       task.wait_for_completion
 
       # get the IP address of the machine for bootstrapping
       # machine name is based on the path, e.g. that includes the folder
-      name = options[:folder].nil? ? options[:name] : format("%s/%s", options[:folder][:name], options[:name])
+      name = options[:folder].nil? ? options[:name] : format('%s/%s', options[:folder][:name], options[:name])
       new_vm = dc.find_vm(name)
 
       if new_vm.nil?
-        puts format("Unable to find machine: %s", name)
+        puts format('Unable to find machine: %s', name)
       else
         puts 'Waiting for network interfaces to become available...'
         sleep 2 while new_vm.guest.net.empty? || !new_vm.guest.ipAddress

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcenter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Russell Seymour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen