kitchen-vcenter 1.3.1 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 708b1e6365ef0e46165bcc9e769fed085b00443bcdc7bec5be10408fcf71bf1c
-  data.tar.gz: c946b45441efa5b7fa06b6f98275923e1222fcdf506091bbce72c917d5003fd1
+  metadata.gz: 9e72f7421bcae71612b39ca42859c0ba3ad8ad8809f29e0e9720e5c8f4ebd668
+  data.tar.gz: '062093f1b32dfff9571cfd4aad8e3072de37fc3485f93ff0908f5d34e60ffa23'
 SHA512:
-  metadata.gz: 8740db6063447e8c72d0fba7df35ce022143136938bb26de5de1f7ed1e6c7521cd94615ea44970358e7345b502a76a029c499521426c0917b228f119fc06c49b
-  data.tar.gz: 3919686c7c95821aa077fbf519a0ab31c36920a2e4392c9f2689b115e553c008bbb03295ca0593a173fe5438da481a043fc2d0fbd8184858c77ff12294680549
+  metadata.gz: 7dd6a013bb356d39b9c59d2eaea3c93f3bc6a9629958fbde48807ab40ea249ef518f05c98580f27d080c73f24da503b5952439fc03368bcae7536eb1772278ee
+  data.tar.gz: 15f635777a44a3e1d6e70af030589300ebb5a8d86e7b74d27d6141c2fdef433d6d32b8b5cf8c467e9ace37e5abde8620034d461ab725ca59378bf0e8e453c6fc

data/CHANGELOG.md

@@ -1,21 +1,29 @@
 # Change Log
 
-<!-- latest_release 1.3.1 -->
-## [v1.3.1](https://github.com/chef/kitchen-vcenter/tree/v1.3.1) (2018-11-19)
+<!-- latest_release 1.3.4 -->
+## [v1.3.4](https://github.com/chef/kitchen-vcenter/tree/v1.3.4) (2019-01-04)
 
 #### Merged Pull Requests
-- Chefstyle fixes [#37](https://github.com/chef/kitchen-vcenter/pull/37) ([tas50](https://github.com/tas50))
+- Fix for Issues #26 and #30 [#44](https://github.com/chef/kitchen-vcenter/pull/44) ([tecracer-theinen](https://github.com/tecracer-theinen))
 <!-- latest_release -->
-<!-- release_rollup since=1.2.1 -->
-### Changes since 1.2.1 release
+<!-- release_rollup since=1.3.1 -->
+### Changes not yet released to rubygems.org
 
 #### Merged Pull Requests
-- Chefstyle fixes [#37](https://github.com/chef/kitchen-vcenter/pull/37) ([tas50](https://github.com/tas50)) <!-- 1.3.1 -->
-- Implement support for linked clones (feature #18) [#32](https://github.com/chef/kitchen-vcenter/pull/32) ([tecracer-theinen](https://github.com/tecracer-theinen)) <!-- 1.3.0 -->
-- Fixed behaviour when not having any resource pools (Issue #28) [#31](https://github.com/chef/kitchen-vcenter/pull/31) ([tecracer-theinen](https://github.com/tecracer-theinen)) <!-- 1.2.2 -->
+- Fix for Issues #26 and #30 [#44](https://github.com/chef/kitchen-vcenter/pull/44) ([tecracer-theinen](https://github.com/tecracer-theinen)) <!-- 1.3.4 -->
+- Feature/check parameters [#40](https://github.com/chef/kitchen-vcenter/pull/40) ([tecracer-theinen](https://github.com/tecracer-theinen)) <!-- 1.3.3 -->
+- README edits [#38](https://github.com/chef/kitchen-vcenter/pull/38) ([mjingle](https://github.com/mjingle)) <!-- 1.3.2 -->
 <!-- release_rollup -->
 <!-- latest_stable_release -->
-## [1.2.0](https://github.com/chef/kitchen-vcenter/tree/1.2.1) (2017-09-14)
+## [v1.3.1](https://github.com/chef/kitchen-vcenter/tree/v1.3.1) (2018-11-19)
+
+#### Merged Pull Requests
+- Fixed behaviour when not having any resource pools (Issue #28) [#31](https://github.com/chef/kitchen-vcenter/pull/31) ([tecracer-theinen](https://github.com/tecracer-theinen))
+- Implement support for linked clones (feature #18) [#32](https://github.com/chef/kitchen-vcenter/pull/32) ([tecracer-theinen](https://github.com/tecracer-theinen))
+- Chefstyle fixes [#37](https://github.com/chef/kitchen-vcenter/pull/37) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
+## [1.2.1](https://github.com/chef/kitchen-vcenter/tree/1.2.1) (2017-09-14)
 [Full Changelog](https://github.com/chef/kitchen-vcenter/compare/v1.2.0...1.2.1)
 
 **Closed issues:**
@@ -25,7 +33,6 @@
 **Merged pull requests:**
 
 - Update dependency reqs. Update README for dep install. [\#12](https://github.com/chef/kitchen-vcenter/pull/12) ([akulbe](https://github.com/akulbe))
-<!-- latest_stable_release -->
 
 ## [v1.2.0](https://github.com/chef/kitchen-vcenter/tree/v1.2.0) (2017-09-12)
 [Full Changelog](https://github.com/chef/kitchen-vcenter/compare/v1.1.0...v1.2.0)

data/README.md

@@ -23,7 +23,7 @@ Please refer to the [CHANGELOG](CHANGELOG.md) for version history and known issu
 
 ## Installation
 
-This driver has a dependency. It requires the [vSphere Automation SDK](https://github.com/vmware/vsphere-automation-sdk-ruby) be installed. The steps to do that are as follows, for the time being it's not published to Rubygems, if you are interested please comment [here](https://github.com/vmware/vsphere-automation-sdk-ruby/issues/10).
+This driver has a dependency. It requires the [vSphere Automation SDK](https://github.com/vmware/vsphere-automation-sdk-ruby) be installed. The steps to do that are as follows, for the time being it's not published to Rubygems. If you are interested, please comment [here](https://github.com/vmware/vsphere-automation-sdk-ruby/issues/10).
 
 - `$ git clone` [https://github.com/vmware/vsphere-automation-sdk-ruby.git](https://github.com/vmware/vsphere-automation-sdk-ruby.git)
 - `cd vsphere-automation-sdk-ruby`
@@ -104,26 +104,31 @@ suites:
 
 ### Required parameters:
 
-The following parameters should be set in the main `driver_config` section as they are common to all platforms.
+The following parameters should be set in the main `driver_config` section as they are common to all platforms:
 
  - `vcenter_username` - Name to use when connecting to the vSphere environment
  - `vcenter_password` - Password associated with the specified user
  - `vcenter_host` - Host against which logins should be attempted
- - `vcenter_disable_ssl_verify` - Whether or not to disable SSL verification checks. Good when using self signed certificates. Default: false
 
-The following parameters should be set in the `driver_config` for the individual platform.
+The following parameters should be set in the `driver_config` for the individual platform:
 
- - `template` - Template or virtual machine to use when cloning the new machine (needs to be a VM for linked clones)
  - `datacenter` - Name of the datacenter to use to deploy into
+ - `template` - Template or virtual machine to use when cloning the new machine (needs to be a VM for linked clones)
 
 ### Optional Parameters
 
+The following parameters should be set in the main `driver_config` section as they are common to all platforms:
+ - `vcenter_disable_ssl_verify` - Whether or not to disable SSL verification checks. Good when using self signed certificates. Default: false
+
 The following optional parameters should be used in the `driver_config` for the platform.
 
  - `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. Will search first pool by default, can use value 'Resources' for none
- - `clone_type` - Type of clone, will default to "full" to create complete copies of template. Needs a VM as template parameter, if "linked" clone desired
+ - `poweron` - Power on the new virtual machine. Default: true
+ - `vm_name` - Specify name of virtual machine. Default: `<suite>-<platform>-<random-hexid>`
+ - `resource_pool` - Name of the resource pool to use when creating the machine. Will search first pool by default, can use value 'Resources' for none.
+ - `clone_type` - Type of clone, will default to "full" to create complete copies of template. Needs a VM as template parameter, if "linked" clone desired.
+ - `lookup_service_host` - Specify hostname of Lookup Service for setups with external PSC. Default: autodetect
 
 ## Contributing
 
@@ -133,9 +138,7 @@ For information on contributing to this project see <https://github.com/chef/che
 
 * Report issues/questions/feature requests on [GitHub Issues][issues]
 
-Pull requests are very welcome! Make sure your patches are well tested.
-Ideally create a topic branch for every separate change you make. For
-example:
+Pull requests are very welcome! Make sure your patches are well tested. Ideally create a topic branch for every separate change you make. For example:
 
 1. Fork the repo
 2. Create your feature branch (`git checkout -b my-new-feature`)

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.3.1"
+  VERSION = "1.3.4"
 end

data/lib/kitchen/driver/vcenter.rb

@@ -28,6 +28,7 @@ require "com/vmware/vcenter"
 require "com/vmware/vcenter/vm"
 require "support/clone_vm"
 require "securerandom"
+require "uri"
 
 # The main kitchen module
 module Kitchen
@@ -37,23 +38,33 @@ module Kitchen
     class Vcenter < Kitchen::Driver::Base
       attr_accessor :connection_options, :ipaddress, :vapi_config, :session_svc, :session_id
 
-      default_config :targethost
-      default_config :folder
-      default_config :template
-      default_config :datacenter
-      default_config :vcenter_username
-      default_config :vcenter_password
-      default_config :vcenter_host
+      required_config :vcenter_username
+      required_config :vcenter_password
+      required_config :vcenter_host
+      required_config :datacenter
+      required_config :template
+
       default_config :vcenter_disable_ssl_verify, false
+      default_config :targethost, nil
+      default_config :folder, nil
       default_config :poweron, true
       default_config :vm_name, nil
       default_config :resource_pool, nil
       default_config :clone_type, :full
+      default_config :lookup_service_host, 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],
+        }
+
         # 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))
@@ -215,13 +226,48 @@ module Kitchen
         resource_pool[0].resource_pool
       end
 
+      # Get location of lookup service
+      def lookup_service_host
+        # Allow manual overrides
+        return config[:lookup_service_host] unless config[:lookup_service_host].nil?
+
+        # Retrieve SSO service via RbVmomi, which is always co-located with the Lookup Service.
+        vim = RbVmomi::VIM.connect @connection_options
+        vim_settings = vim.serviceContent.setting.setting
+        sso_url = vim_settings.select { |o| o.key == "config.vpxd.sso.sts.uri" }&.first&.value
+
+        # Configuration fallback, if no SSO URL found for some reason
+        ls_host = sso_url.nil? ? config[:vcenter_host] : URI.parse(sso_url).host
+        debug("Using Lookup Service at: " + ls_host)
+
+        ls_host
+      end
+
+      # Get vCenter FQDN
+      def vcenter_host
+        # Retrieve SSO service via RbVmomi, which is always co-located with the Lookup Service.
+        vim = RbVmomi::VIM.connect @connection_options
+        vim_settings = vim.serviceContent.setting.setting
+
+        vim_settings.select { |o| o.key == "VirtualCenter.FQDN" }.first.value
+      end
+
       # The main connect method
       #
       def connect
         # Configure the connection to vCenter
-        lookup_service_helper = LookupServiceHelper.new(config[:vcenter_host])
+        lookup_service_helper = LookupServiceHelper.new(lookup_service_host)
         vapi_urls = lookup_service_helper.find_vapi_urls
-        vapi_url = vapi_urls.values[0]
+        debug("Found vAPI endpoints: [" + vapi_urls.to_s + "]")
+
+        vim_urls = lookup_service_helper.find_vim_urls
+        debug("Found VIM endpoints: [" + vim_urls.to_s + "]")
+
+        node_id = vim_urls.select { |id, url| url.include? vcenter_host }.keys.first
+        debug("NodeID of vCenter " + config[:vcenter_host] + " is " + node_id.to_s)
+
+        vapi_url = lookup_service_helper.find_vapi_url(node_id)
+        debug("vAPI Endpoint for vCenter is " + vapi_url)
 
         # Create the VAPI config object
         ssl_options = {}
@@ -242,14 +288,6 @@ module Kitchen
         vapi_config.set_security_context(
           VAPI::Security.create_session_security_context(session_id)
         )
-
-        # 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],
-        }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vcenter
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.4
 platform: ruby
 authors:
 - Russell Seymour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi