kitchen-vra 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f16b036a56b3f13f8def98498eb1a101c1feb02d
-  data.tar.gz: fabcc430c9d91f4720625af34eef073c295c49d1
+  metadata.gz: 809c8cf566e76098fd34ca3428983d631d4e4170
+  data.tar.gz: f4863346038f89134bd1d9de0c60184abfeebed5
 SHA512:
-  metadata.gz: 5bf076a6e0b2f56330977dbb00267d311a382178b89085ad94e2133bcbc7229b4eb500f2669f7e2d7ea559bf17f3fa23fe92565bb56d31522320e5e22790e861
-  data.tar.gz: a6bbb96508c893bc1a022f3141d252a5abe40a54aa9b82abd37f147ff0143e37522abc478a04404fee4ada7bcd0b9cfdc163c5525c3c815927bab63542b340df
+  metadata.gz: dd0290ce381d0adfda2ea38de3d34afcf346e4a28c6692a7ad0f1c29e05ea84323e454ad55d26669f4378284c19d59e4c8f83e2266596f6bba5fd9f0691a8245
+  data.tar.gz: 97e02008a31a9a84e0e109b2bc873e18abf9f4bfe791d43f9beec8f563d74ded8c263f6e46e1ff11a645adc11dd986944a84432ed3617d5589b9ec2c44f23b2e

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# kitchen-vra Changelog
+
+## v1.1.0 (2015-10-13)
+* New `use_dns` option (defaults to false) for the driver to use the server name instead of the IP address - thanks to @stevehedrick in PR [#3](https://github.com/chef-partners/kitchen-vra/pull/3)
+
+## v1.1.0
+* Initial reelase
+

data/README.md

@@ -57,6 +57,7 @@ Other options that you can set include:
  * **requested_for**: the vRA login ID to list as the owner of this resource. Defaults to the vRA username configured in the `driver` section.
  * **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.
 
 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/lib/kitchen/driver/vra.rb

@@ -50,6 +50,7 @@ module Kitchen
           file if File.exist?(file)
         end.compact.first
       end
+      default_config :use_dns, false
 
       def name
         'vRA'
@@ -60,11 +61,14 @@ module Kitchen
 
         server = request_server
         state[:resource_id] = server.id
-
-        ip_address = server.ip_addresses.first
-        raise 'No IP address returned for the vRA request' if ip_address.nil?
-        state[:hostname] = server.ip_addresses.first
-        state[:ssh_key]  = config[:private_key_path] unless config[:private_key_path].nil?
+        if config[:use_dns]
+          raise 'No server name returned for the vRA request' if server.name.nil?
+          state[:hostname] = server.name
+        else
+          raise 'No IP address returned for the vRA request' if server.ip_addresses.first.nil?
+          state[:hostname] = server.ip_addresses.first
+        end
+        state[:ssh_key] = config[:private_key_path] unless config[:private_key_path].nil?
 
         wait_for_server(state, server)
         info("Server #{server.id} (#{server.name}) ready.")

data/lib/kitchen/driver/vra_version.rb

@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    VRA_VERSION = '1.0.0'
+    VRA_VERSION = '1.1.0'
   end
 end

data/spec/vra_spec.rb

@@ -41,7 +41,8 @@ describe Kitchen::Driver::Vra do
       requested_for: 'override_user@corp.local',
       notes:         'some notes',
       subtenant_id:  '160b473a-0ec9-473d-8156-28dd96c0b6b7',
-      lease_days:    5
+      lease_days:    5,
+      use_dns:       false
     }
   end
 
@@ -102,16 +103,24 @@ describe Kitchen::Driver::Vra do
       expect(state[:resource_id]).to eq('e8706351-cf4c-4c12-acb7-c90cc683b22c')
     end
 
-    describe 'getting the IP address from the server' do
-      context 'when no IP addresses are returned' do
-        it 'raises an exception' do
-          allow(resource).to receive(:ip_addresses).and_return([])
+    describe 'setting the hostname in the state hash' do
+      context 'when use_dns is true' do
+        let(:config) { { use_dns: true } }
+        it 'raises an exception if the server name is nil' do
+          allow(resource).to receive(:name).and_return(nil)
           expect { driver.create(state) }.to raise_error(RuntimeError)
         end
+        it 'uses the server name as the hostname' do
+          driver.create(state)
+          expect(state[:hostname]).to eq('server1')
+        end
       end
-
-      context 'when IP addresses are returned' do
-        it 'sets the IP address as the hostname in the state hash' do
+      context 'when use_dns is false' do
+        it 'raises an exception if no IP address is available' do
+          allow(resource).to receive(:ip_addresses).and_return([])
+          expect { driver.create(state) }.to raise_error(RuntimeError)
+        end
+        it 'uses the IP address as the hostname' do
           driver.create(state)
           expect(state[:hostname]).to eq('1.2.3.4')
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vra
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -123,6 +123,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen driver for VMware vRealize Automation (vRA)