chef-provisioning-vsphere 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92dd7232f0e413e7c361d52694f55afaa06ff284
-  data.tar.gz: e2fade153c0e0fc4afa2743fd3fa630cd5edc722
+  metadata.gz: 37f82ea348c58634c6971b8714c71b31c91c0cc5
+  data.tar.gz: d31a7417afd87dd0b475a81ffb529a6c990de31e
 SHA512:
-  metadata.gz: 8ec7e70b47e2297b91cba24d7c22e5d95ae67e873a472c269a988c95f3e04a92de2a29ba9dee10de014dd47d78f65e77ec5f2bc4983f4d6f4661a07442ee2288
-  data.tar.gz: 2f6e4e64d1dffeb4880463c6e8d3ee991924068d38aa8f9e159022c727bacda2a1d5c4ebee386f7aed9b03473392904b99529d9e003e282f5214b2ee0d523789
+  metadata.gz: 2653688852fe8b84876266ffc34a674cc82f038b39958af172c378d80ddabf7e0921a0daaaff11c5d4a7be69ea670faae77a744ef136df41dbd81d421bfff0a5
+  data.tar.gz: da5199536bf1a4122085fab98ab11b5db08cecad6ef346b19fc17337b1d2c948d9c0f6b3c3e911c89650ab24a19ee9f0d2342b728b97cc80baf8e7d731b5621f

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [v2.2.1](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.2.1)
+## [v2.2.2](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.2.2)
 
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.2.1...v2.2.2)
+
+**Merged pull requests:**
+
+- Fix bug where ip address is not returned from guest tools [\#85](https://github.com/chef-partners/chef-provisioning-vsphere/pull/85) ([josh-barker](https://github.com/josh-barker))
+
+## [v2.2.1](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.2.1) (2018-06-04)
 [Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.2.0...v2.2.1)
 
 **Merged pull requests:**

data/Rakefile

@@ -38,4 +38,4 @@ YARD::Rake::YardocTask.new do |t|
   t.stats_options = ['--list-undoc'] # optional
 end
 
-task default: %i[style unit]
+task default: %i(style unit)

data/chef-provisioning-vsphere.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/chef-partners/chef-provisioning-vsphere'
   s.license = 'MIT'
   s.bindir       = 'bin'
-  s.executables  = %w[]
+  s.executables  = %w()
   s.require_path = 'lib'
   s.files        = `git ls-files -z`.split("\x0")
   s.test_files   = s.files.grep(%r{^(test|spec|features)/})

data/lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb

@@ -178,7 +178,7 @@ module ChefProvisioningVsphere
     def hostname_from(options, vm_name)
       hostname = options[:hostname] || vm_name
       test = /^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])$/
-      unless hostname.match(test)
+      unless hostname.match?(test)
         raise 'Only letters, numbers or hyphens in hostnames allowed'
       end
       RbVmomi::VIM::CustomizationFixedName.new(name: hostname)

data/lib/chef/provisioning/vsphere_driver/driver.rb

@@ -868,26 +868,27 @@ module ChefProvisioningVsphere
     def ip_to_bootstrap(bootstrap_options, vm)
       start_time = Time.now.utc
       timeout = bootstrap_ip_ready_timeout(bootstrap_options)
-      @vm_helper.find_port?(vm, bootstrap_options) unless vm_helper.port?
+      vm_helper.find_port?(vm, bootstrap_options) unless vm_helper.port?
+
       # First get the IP to be tested
       if has_static_ip(bootstrap_options)
         if bootstrap_options[:customization_spec].is_a?(String)
           spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
-          vm_ip = spec.nicSettingMap[0].adapter.ip.ipAddress # Use a direct return here?
+          vm_ip = spec.nicSettingMap[0].adapter.ip.ipAddress
         else
           ## Check if true available
-          vm_ip = bootstrap_options[:customization_spec][:ipsettings][:ip] unless vm_helper.ip?
-          nb_attempts = 0
-          until @vm_helper.open_port?(vm_ip, @vm_helper.port, 1) || (nb_attempts > (bootstrap_options[:ready_timeout] || 90))
-            print '.'
-            nb_attempts += 1
-          end
+          vm_ip = bootstrap_options[:customization_spec][:ipsettings][:ip]
         end
       elsif use_ipv4_during_bootstrap?(bootstrap_options)
         vm_ip = wait_for_ipv4(bootstrap_ipv4_timeout(bootstrap_options), vm)
       else
-        vm_ip = vm.guest.ipAddress until vm_guest_ip?(vm) || Time.now.utc - start_time > timeout
+        until vm_guest_ip?(vm) || Time.now.utc - start_time > timeout
+          print '.'
+          sleep 1
+        end
+        vm_ip = vm.guest.ipAddress
       end
+
       # Then check that it is reachable
       until Time.now.utc - start_time > timeout
         print '.'

data/lib/chef/provisioning/vsphere_driver/version.rb

@@ -3,5 +3,5 @@
 # Provisions machines in vSphere.
 module ChefProvisioningVsphere
   # The version of this awesome Gem. BOOM.
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.2.2'.freeze
 end

data/lib/chef/provisioning/vsphere_driver/vm_helper.rb

@@ -17,12 +17,6 @@ module ChefProvisioningVsphere
       Timeout::Error, IPAddr::AddressFamilyError
     ].freeze
 
-    # If the IP is true
-    #
-    def ip?
-      @ip
-    end
-
     # If the port is true
     #
     def port?

data/lib/kitchen/driver/vsphere.rb

@@ -23,12 +23,12 @@ module Kitchen
                        ssh: {
                          user: 'root',
                          paranoid: false,
-                         port: 22,
+                         port: 22
                        },
                        convergence_options: {},
                        customization_spec: {
-                         domain: 'local',
-                       },
+                         domain: 'local'
+                       }
                      }
 
       default_config(:vsphere_name) do |driver|

data/spec/unit_tests/VsphereDriver_spec.rb

@@ -130,4 +130,94 @@ describe ChefProvisioningVsphere::VsphereDriver do
       end
     end
   end
+
+  context "#ip_to_bootstrap" do
+    let(:metal_config) { {} }
+    let(:vm) { double("vm") }
+    let(:vm_helper) do
+      double("vm_helper")
+    end
+    before do
+      allow_any_instance_of(Kernel).to receive(:print)
+    end
+
+    before do
+      allow(subject).to receive(:vm_helper).and_return(vm_helper)
+
+      allow(vm_helper).to receive(:find_port?)
+      allow(vm_helper).to receive(:port?)
+      allow(vm_helper).to receive(:port).and_return(port)
+    end
+
+    let(:port) { 22 }
+    let(:bootstrap_conf) { {} }
+    
+    context "has_static_ip" do
+      let(:bootstrap_conf) { { customization_spec: "some spec" } }
+      context "customization_spec is named" do
+        let(:vsphere_helper) { double("vsphere_helper") }
+        let(:fake_spec) { double("fake_spec") }
+        let(:fake_adapter) { double("fake_adapter") }
+        let(:fake_ip) do
+          RbVmomi::VIM::CustomizationFixedIp(
+            ipAddress: "1.1.1.1"
+          )
+        end
+
+        it "return ip address" do
+          allow(subject).to receive(:vsphere_helper).and_return(vsphere_helper)
+          allow(fake_adapter).to receive_message_chain(:adapter, :ip).and_return(fake_ip)
+          allow(fake_spec).to receive(:nicSettingMap).and_return([fake_adapter])
+          allow(vsphere_helper).to receive(:find_customization_spec).and_return(fake_spec)
+          allow(vm_helper).to receive(:open_port?).with("1.1.1.1", port, 1).and_return(true)
+
+          result = subject.send :ip_to_bootstrap, bootstrap_conf, vm
+          expect(result).to eq "1.1.1.1"
+        end
+      end
+
+      context "customization_spec has an ip address" do
+        let(:bootstrap_conf) do
+          { 
+            customization_spec: {
+              ipsettings: {
+                ip: "2.2.2.2"
+              }
+            } 
+          }
+        end
+
+        it "returns ip address" do
+          allow(vm_helper).to receive(:ip?)
+          allow(vm_helper).to receive(:open_port?).with("2.2.2.2", port, 1).and_return(true)
+          result = subject.send :ip_to_bootstrap, bootstrap_conf, vm
+          expect(result).to eq "2.2.2.2"
+        end
+      end
+    end
+
+    context "use_ipv4_during_bootstrap" do
+      let(:bootstrap_conf) { { bootstrap_ipv4: true } }
+
+      it "returns ip address" do
+        allow(subject).to receive(:wait_for_ipv4).and_return("3.3.3.3")
+        allow(vm_helper).to receive(:open_port?).with("3.3.3.3", port, 1).and_return(true)
+
+        result = subject.send :ip_to_bootstrap, bootstrap_conf, vm
+        expect(result).to eq "3.3.3.3"
+      end
+    end
+
+    context "wait until guest tools returns an IP address" do
+      it "returns ip address" do
+        allow_any_instance_of(Kernel).to receive(:sleep)
+        expect(subject).to receive(:vm_guest_ip?).exactly(3).times.and_return(false, false, true)
+        allow(vm).to receive_message_chain(:guest, :ipAddress).and_return("4.4.4.4")
+
+        allow(vm_helper).to receive(:open_port?).exactly(1).times.with("4.4.4.4", port, 1).and_return(true)
+        result = subject.send :ip_to_bootstrap, bootstrap_conf, vm
+        expect(result).to eq "4.4.4.4"
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef