knife-vrealize 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d9ed1c0da967a7f546ea03d5b82b603a80e72f
-  data.tar.gz: 0d59826e9bd3cbc25639432815870cc2b62f73f5
+  metadata.gz: 685f497d4a7f7d514fcbc5ace96b61004f14a6d1
+  data.tar.gz: b689e3de61b31e5615f454fd1ebf31c8f42b17be
 SHA512:
-  metadata.gz: bf7a696e7bcfe5cdca74c065943d01b35a1fb3a32d5b07f72f01a7603894405057e3d67ff03b81c54c0f932f6e291ed552efd88c97551f3edb38817729304b9c
-  data.tar.gz: 01bf0b0454049fdab9fd9af2f529e8b3aa32576d0769a3299af3c88c10b88faa208bd79003e25dcdb343b3ac0655d8688948fbfec27b75867bc797223b092839
+  metadata.gz: e457deb5adb9e686bfc9ec320ba164d7b0d563d0cfee1b113f20396af2ac5e34ca6b9976fddcf24e6fc14bda22c7f1aeb3cd05641956e5eb1eb7d0345415a36d
+  data.tar.gz: 5d4762e856625283df25a725e789467491d13254dd75ddcadc165ac52b996e4ca293dbf86326a65a271c10309e49209227303fc97fcd89b18e508a080ff04bc0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # knife-vrealize Change Log
 
+## Release: v1.4.0
+ * [pr#10](https://github.com/chef-partners/knife-vrealize/pull/10) Added logic to prefer the IP address if it's available, but fallback to the rsource record / server name if it's not.
+
 ## Release: v1.3.1
  * [pr#9](https://github.com/chef-partners/knife-vrealize/pull/9) Bug fix for handling of extra parameters, which were never properly sent to the vRA API
 

data/lib/chef/knife/vra_server_create.rb

@@ -109,7 +109,7 @@ class Chef
           super
 
           config[:chef_node_name] = locate_config_value(:chef_node_name) ? locate_config_value(:chef_node_name) : server.name
-          config[:bootstrap_ip_address] = server.ip_addresses.first
+          config[:bootstrap_ip_address] = hostname_for_server
         end
 
         def extra_params
@@ -130,6 +130,12 @@ class Chef
               param[:type] == 'string' || param[:type] == 'integer'
           end
         end
+
+        def hostname_for_server
+          ip_address = server.ip_addresses.first
+
+          ip_address.nil? ? server.name : ip_address
+        end
       end
     end
   end

data/lib/knife-vrealize/version.rb

@@ -17,5 +17,5 @@
 #
 
 module KnifeVrealize
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/spec/unit/vra_server_create_spec.rb

@@ -147,4 +147,24 @@ describe Chef::Knife::Cloud::VraServerCreate do
       end
     end
   end
+
+  describe '#hostname_for_server' do
+    let(:server)       { double('server') }
+    let(:ip_addresses) { [ '1.2.3.4' ] }
+
+    it 'returns the IP address if it exists' do
+      allow(subject).to receive(:server).and_return(server)
+      allow(server).to receive(:ip_addresses).and_return(ip_addresses)
+
+      expect(subject.hostname_for_server).to eq('1.2.3.4')
+    end
+
+    it 'returns the hostname if the IP address is missing' do
+      allow(subject).to receive(:server).and_return(server)
+      allow(server).to receive(:ip_addresses).and_return([])
+      allow(server).to receive(:name).and_return('test_name')
+
+      expect(subject.hostname_for_server).to eq('test_name')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vrealize
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef