kitchen-vcenter 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ad83365e404c24b62793647a264cc753dcd8c39
-  data.tar.gz: 39add38626871f3a8720cd2bff7c28cdb904d56a
+  metadata.gz: 454d333022d2532747b2ed4898e73a6c7dcd1c1d
+  data.tar.gz: ae47fafaebc7877904ad593189c0ea80f58e9be5
 SHA512:
-  metadata.gz: 9acb72a51bae96c57eff8b8b7074b132b22b3c07c28c1ad781d20e60a1ee2db173c3df65b420b290db929f54cc4b0e07e04dc5ef75a8a78f3d4ef0ff3c39c13b
-  data.tar.gz: 0c1b2ab4a0426c987047ab6843aa4f852604ecb2c068c4533b4d1c302dbaa509a4fad1875baa6376bfc69d7f9f4f4cf18832c53e225f066178e97b20916ba27d
+  metadata.gz: e90f3149b3fe275fd802cd62998cb03b8787a1a059b30635093b96b6e597da0c600c3f7f8eec5d25bbafc2ccaa84d9cff797ce5ed150354e7d70a4619c988f65
+  data.tar.gz: 2c03bbfb40de07916c0fd42d6eaf1caf7a07c1cd9ddef96474ce011798bfc5adabbd0c23b37e342d7f0b9bd87b35a1f8cac335e740540aaeb621e6b33e74901d

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [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)
+## [1.2.0](https://github.com/chef/kitchen-vcenter/tree/1.2.0) (2017-09-12)
+[Full Changelog](https://github.com/chef/kitchen-vcenter/compare/v1.1.0...1.2.0)
+
+**Merged pull requests:**
+
+- Resource pool and target host no longer have to be specified. [\#10](https://github.com/chef/kitchen-vcenter/pull/10) ([russellseymour](https://github.com/russellseymour))
+
+## [v1.1.0](https://github.com/chef/kitchen-vcenter/tree/v1.1.0) (2017-09-07)
+[Full Changelog](https://github.com/chef/kitchen-vcenter/compare/v1.0.0...v1.1.0)
 
 **Closed issues:**
 

data/README.md

@@ -48,9 +48,7 @@ driver:
   vcenter_host: vcenter.chef.io
   vcenter_disable_ssl_verify: true
   driver_config:
-    targethost: 172.16.20.41
     datacenter: "Datacenter"
-    resource_pool: "testkitchen"
 
 platforms:
   - name: ubuntu-1604
@@ -73,16 +71,16 @@ The following parameters should be set in the main `driver_config` section as th
 
 The following parameters should be set in the `driver_config` for the individual platform.
 
- - `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
 
 The following optional parameters should be used in the `driver_config` for the platform.
 
- - `folder` - Folder into which the new machine should be stored. If specified the folder _must_ already exist
+ - `targethost` - Host on which the new virtual machine should be created. If not specified then the first host in the cluster is used.
+ - `folder` - Folder into which the new machine should be stored. If specified the folder _must_ already exist.
+ - `resource_pool` - Name of the resource pool to use when creating the machine. If specified the resource pool _must_ already exist
 
 ## Contributing
 

data/lib/kitchen-vcenter/version.rb

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

data/lib/kitchen/driver/vcenter.rb

@@ -55,7 +55,7 @@ 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?
+        # 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
 
@@ -127,9 +127,15 @@ module Kitchen
       end
 
       def get_host(name)
-        filter = Com::Vmware::Vcenter::Host::FilterSpec.new(names: Set.new([name]))
+        # create a host object to work with
         host_obj = Com::Vmware::Vcenter::Host.new(vapi_config)
-        host = host_obj.list(filter)
+
+        if name.nil?
+          host = host_obj.list
+        else
+          filter = Com::Vmware::Vcenter::Host::FilterSpec.new(names: Set.new([name]))
+          host = host_obj.list(filter)
+        end
 
         raise format('Unable to find target host: %s', name) if host.empty?
 
@@ -139,7 +145,6 @@ module Kitchen
       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.names = name
         folder_obj = Com::Vmware::Vcenter::Folder.new(vapi_config)
         folder = folder_obj.list(filter)
 
@@ -155,12 +160,20 @@ module Kitchen
       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]))
+        # Create a resource pool object
         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?
+        # If a name has been set then try to find it, otherwise use the first
+        # resource pool that can be found
+        if name.nil?
+          resource_pool = rp_obj.list
+        else
+          # create a filter to find the named resource pool
+          filter = Com::Vmware::Vcenter::ResourcePool::FilterSpec.new(names: Set.new([name]))
+          resource_pool = rp_obj.list(filter)
+        end
+
+        raise format('Unable to find Resource Pool: %s', name) if resource_pool.nil?
 
         resource_pool[0].resource_pool
       end

data/lib/support/clone_vm.rb

@@ -16,9 +16,13 @@ class Support
       dc = vim.serviceInstance.find_datacenter(options[:datacenter])
       src_vm = dc.find_vm(options[:template])
 
+      raise format("Unable to find template: %s", options[:template]) if src_vm.nil?
+
       # Specify where the machine is going to be created
       relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec
       relocate_spec.host = options[:targethost]
+
+      # Set the resource pool
       relocate_spec.pool = options[:resource_pool]
 
       clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(location: relocate_spec,

metadata

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