vagrant-parallels 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc3b37f94bef78ed214b98add9ae9814d6cad49650e5016fce26c7b7641eaaa
-  data.tar.gz: 0e1ffee3b192374a3acc9b36438334605702e7c5b472d1e47857a31acd5c7196
+  metadata.gz: 45a092a3894860152f2315793cb2a6ca541bc3488b168e3e08c9ba9637f8c867
+  data.tar.gz: 7e6a76e6734bad9691232004722d0cc04f5bc53992798bd6e5074341dce985af
 SHA512:
-  metadata.gz: f03a6bc1a95f28f95a736d3ce59dc52edb00bd609780e24ef26b38090ef32421ef8db5f362cd9692954aa88292e18af89cd884ea423f9a244d5932cdfff1749d
-  data.tar.gz: 86467aba98c5870183d5da52a0b688ca28f5f06eb5160d983ea26d80a582a20108958e0b54c2c4ee14adb8f3740608ffeaf4f84debdbafb614a79da75c9f8e5b
+  metadata.gz: 5ff72d8b55fde7f2d4444048fe9c736e0f312c61f8b5098b0ac5569a1b3415a6c6671b9c54375190cbcd43aebf55b74fbde681ae9ff2c77f0144bd199a525b60
+  data.tar.gz: 5181b7a0c84d03f593e7e4102e8289c95c292a5328566802f017851617259911012745707b78799bf113bd96e78200f95a6762abbb85135181883c273439dd6b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.3.1 (March 23, 2022)
+BUG FIXES:
+  - Fix the detection of VM IP. Wait for the IP to become available to
+  avoid connection issues and Vagrant warnings.
+  [[GH-440](https://github.com/Parallels/vagrant-parallels/issues/440)]
+
 ## 2.3.0 (March 22, 2022)
 IMPROVEMENTS:
   - Support fetching the VM IP using prlctl

data/lib/vagrant-parallels/driver/base.rb

@@ -406,6 +406,7 @@ module VagrantPlugins
         # Returns an IP of the virtual machine fetched from the DHCP lease file.
         # It requires that Shared network adapter is configured for this VM
         # and it obtains an IP via DHCP.
+        # Returns an empty string if the IP coudn't be determined this way.
         #
         # @return [String] IP address leased by DHCP server in "Shared" network
         def read_guest_ip_dhcp
@@ -432,12 +433,13 @@ module VagrantPlugins
         end
 
         # Returns an IP of the virtual machine fetched from prlctl.
+        # Returns an empty string if the IP coudn't be determined this way.
         #
         # @return [String] IP address returned by `prlctl list -f` command
         def read_guest_ip_prlctl
           vm_info = json { execute_prlctl('list', @uuid, '--full', '--json') }
-          ip = vm_info.first.fetch('ip_configured', nil)
-          ip == '-' ? nil : ip
+          ip = vm_info.first.fetch('ip_configured', '')
+          ip == '-' ? '' : ip
         end
 
         # Returns path to the Parallels Tools ISO file.
@@ -768,13 +770,25 @@ module VagrantPlugins
         end
 
         # Reads the SSH IP of this VM from DHCP lease file or from `prlctl list`
-        # command - whatever returns a non-empty result.
+        # command - whatever returns a non-empty result first.
         # The method with DHCP does not work for *.macvm VMs on Apple M-series Macs,
         # so we try both sources here.
         #
         # @return [String] IP address to use for SSH connection to the VM.
         def ssh_ip
-          read_guest_ip_dhcp || read_guest_ip_prlctl
+          5.times do
+            ip = read_guest_ip_dhcp
+            return ip unless ip.empty?
+
+            ip = read_guest_ip_prlctl
+            return ip unless ip.empty?
+
+            sleep 2
+          end
+
+          # We didn't manage to determine IP - return nil and
+          # expect SSH client to do a retry
+          return nil
         end
 
         # Reads the SSH port of this VM.

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '2.3.0'
+    VERSION = '2.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri