kitchen-vra 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98878e22947599571b70328db9898022ca77a5bd
-  data.tar.gz: 1cee24e2e080399e07d80944bfc427897d296b00
+  metadata.gz: d970c0fc31cd5c31e9a8f58730685566ddd6966e
+  data.tar.gz: 37afb04eae13147372daab1b369384b488eb8501
 SHA512:
-  metadata.gz: 6193815b0124e378cc99916c481cd88603b4c5da6c8fb7c5a26bf5780c0be178da699aebd0aabd3adf78ae1d3de6be9615957f9014396c6fa731abe10bcbaa2d
-  data.tar.gz: 89a55dc98f05720110c34dcabfc85ba29ea1883cd1dd44a452e9ccd870348727312136b328256fafb9e3d2b6aaf844901ebd57c7ea499129ce1fca464d61b846
+  metadata.gz: f3e138de6690364ba22d75ec989a64e50c7544dc6c62333369c55c61f0adc8928679761a770c06c85a72e9dc68a6b2a967cd37c1af9777b49be01c721548efa4
+  data.tar.gz: e5d69ab680453bbcdff3ceb63f8cb9c06dde78b851afb3a87549dd153781d1377980d230dc14671366f2a6e9ae0f74a42c2e1ecd62c25e8fedf1b7ba2606c997

data/.rubocop.yml

@@ -1,3 +1,5 @@
+AllCops:
+  DisplayCopNames: true
 Metrics/AbcSize:
   Max: 50
 Metrics/ClassLength:
@@ -12,3 +14,6 @@ Style/SignalException:
   Enabled: false
 Style/SpaceInsideBrackets:
   Enabled: false
+Metrics/BlockLength:
+  Exclude:
+    - "**/*_spec.rb"

data/.travis.yml

@@ -3,7 +3,6 @@ cache: bundler
 sudo: false
 
 rvm:
-- 2.0.0
 - 2.1
 - 2.2
 

data/CHANGELOG.md

@@ -1,7 +1,20 @@
 # Change Log
 
-## [v2.0.0](https://github.com/chef-partners/kitchen-vra/tree/v2.0.0)
+## [Unreleased](https://github.com/chef-partners/kitchen-vra/tree/HEAD)
 
+[Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v2.0.0...HEAD)
+
+**Closed issues:**
+
+- extra\_parameters  not passing correctly for vRA version  7.X [\#20](https://github.com/chef-partners/kitchen-vra/issues/20)
+- Failure on notes config setting [\#15](https://github.com/chef-partners/kitchen-vra/issues/15)
+
+**Merged pull requests:**
+
+- Bump version for release [\#21](https://github.com/chef-partners/kitchen-vra/pull/21) ([jjasghar](https://github.com/jjasghar))
+- Add support for a DNS suffix appended to server.name [\#19](https://github.com/chef-partners/kitchen-vra/pull/19) ([jeremymv2](https://github.com/jeremymv2))
+
+## [v2.0.0](https://github.com/chef-partners/kitchen-vra/tree/v2.0.0) (2016-12-15)
 [Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v1.3.0...v2.0.0)
 
 **Closed issues:**
@@ -55,4 +68,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -59,6 +59,7 @@ Other options that you can set include:
  * **subtenant_id**: the Business Group ID to list as the owner. This is required if the catalog item is a shared/global item; we are unable to determine the subtenant_id from the catalog, and vRA requires it to be set on every request.
  * **private_key_path**: path to the SSH private key to use when logging in. Defaults to '~/.ssh/id_rsa' or '~/.ssh/id_dsa', preferring the RSA key. Only applies to instances where SSH transport is used; i.e., does not apply to Windows hosts with the WinRM transport configured.
  * **use_dns**: Defaults to `false`.  Set to `true` if vRA doesn't manage vm ip addresses.  This will cause kitchen to attempt to connect via hostname.
+ * **dns_suffix**: Defaults to `nil`.  Set to your domain suffix, for example 'mydomain.com'.  This only takes effect when `use_dns` == true and is appended to the hostname returned by vRA.
  * **extra_parameters**: a hash of other data to set on a catalog request, most notably custom properties. Allows updates to existing properties on the blueprint as well as the addition of new properties. The vRA REST API expects 'provider-' appended to the front of a property name; each key in the hash is the property name, and the value is a another hash containing the value data type and the value itself.
 
 These settings can be set globally under the top-level `driver` section, or they can be set on each platform, which allows you to set globals and then override them. For example, this configuration would set the CPU count to 1 except on the "large" platform:

data/kitchen-vra.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'test-kitchen'
-  spec.add_dependency 'vmware-vra',   '~> 2'
+  spec.add_dependency 'vmware-vra', '~> 2'
 
   spec.add_development_dependency 'bundler',   '~> 1.7'
   spec.add_development_dependency 'rake',      '~> 10.0'

data/lib/kitchen/driver/vra.rb

@@ -52,6 +52,7 @@ module Kitchen
         end.compact.first
       end
       default_config :use_dns, false
+      default_config :dns_suffix, nil
 
       def name
         'vRA'
@@ -72,7 +73,7 @@ module Kitchen
       def hostname_for(server)
         if config[:use_dns]
           raise 'No server name returned for the vRA request' if server.name.nil?
-          return server.name
+          return config[:dns_suffix] ? "#{server.name}.#{config[:dns_suffix]}" : server.name
         end
 
         ip_address = server.ip_addresses.first

data/lib/kitchen/driver/vra_version.rb

@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    VRA_VERSION = '2.0.0'.freeze
+    VRA_VERSION = '2.1.0'.freeze
   end
 end

data/spec/vra_spec.rb

@@ -51,8 +51,7 @@ describe Kitchen::Driver::Vra do
                     logger:    logger,
                     transport: transport,
                     platform:  platform,
-                    to_str:    'instance_str'
-                   )
+                    to_str:    'instance_str')
   end
 
   before do
@@ -124,6 +123,19 @@ describe Kitchen::Driver::Vra do
              vm?: true)
     end
 
+    context 'when use_dns is true and dns_suffix is defined' do
+      let(:config) do
+        {
+          use_dns:      true,
+          dns_suffix:   'my.com'
+        }
+      end
+
+      it 'returns the server name with suffix appended' do
+        expect(driver.hostname_for(server)).to eq('test_hostname.my.com')
+      end
+    end
+
     context 'when use_dns is true' do
       let(:config) { { use_dns: true } }
 
@@ -439,8 +451,7 @@ describe Kitchen::Driver::Vra do
           cpus:          2,
           memory:        2048,
           extra_parameters: { 'key1' => { type: 'string', value: 'value1' },
-                              'key2' => { type: 'integer', value: 123 }
-                            }
+                              'key2' => { type: 'integer', value: 123 } }
         }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vra
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen