Merge pull request #162 from mkuzmin/wait-winrm

use Vagrant core API for waiting of communicator

.rubocop_todo.yml

@@ -35,7 +35,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 161
+  Max: 162
 
 # Offense count: 3
 Metrics/PerceivedComplexity:

lib/vSphere/action.rb

@@ -109,6 +109,7 @@ def self.action_up
             b2.use PowerOn unless env[:result]
           end
           b.use CloseVSphere
+          b.use WaitForCommunicator
           b.use Provision
           b.use SyncedFolders
           b.use SetHostname

lib/vSphere/action/clone.rb

@@ -1,14 +1,12 @@
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'
-require 'vSphere/util/machine_helpers'
 
 module VagrantPlugins
   module VSphere
     module Action
       class Clone
         include Util::VimHelpers
-        include Util::MachineHelpers
 
         def initialize(app, _env)
           @app = app
@@ -92,9 +90,6 @@ def call(env)
 
           machine.id = new_vm.config.uuid
 
-          # wait for SSH to be available
-          wait_for_ssh env
-
           env[:ui].info I18n.t('vsphere.vm_clone_success')
 
           @app.call env

lib/vSphere/action/is_running.rb

@@ -1,11 +1,7 @@
-require 'vSphere/util/machine_helpers'
-
 module VagrantPlugins
   module VSphere
     module Action
       class IsRunning
-        include Util::MachineHelpers
-
         def initialize(app, _env)
           @app = app
         end

lib/vSphere/action/power_on.rb

@@ -1,7 +1,6 @@
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'
-require 'vSphere/util/machine_helpers'
 require 'vSphere/util/vm_helpers'
 
 module VagrantPlugins
@@ -10,7 +9,6 @@ module Action
       class PowerOn
         include Util::VimHelpers
         include Util::VmHelpers
-        include Util::MachineHelpers
 
         def initialize(app, _env)
           @app = app
@@ -22,9 +20,6 @@ def call(env)
           env[:ui].info I18n.t('vsphere.power_on_vm')
           power_on_vm(vm)
 
-          # wait for SSH to be available
-          wait_for_ssh env
-
           @app.call env
         end
       end

locales/en.yml

@@ -7,7 +7,7 @@ en:
     requesting_sdrs_recommendation: |-
       Calling vSphere RecommendDatastores with StoragePlacementSpec of the following settings:
     vm_clone_success: |-
-      New virtual machine successfully cloned and started
+      New virtual machine successfully cloned
     destroy_vm: |-
       Calling vSphere Destroy
     power_off_vm: |-
@@ -20,10 +20,6 @@ en:
       The VM has not been created
     vm_not_running: |-
       The VM is not running
-    waiting_for_ssh: |-
-      Waiting for SSH to become available...
-    waiting_for_winrm: |-
-      Waiting for WinRM to become available...
 
     errors:
       missing_template: |-

spec/spec_helper.rb

@@ -68,6 +68,7 @@ def call
                  hostname: nil,
                  communicator: nil,
                  networks: [[:private_network, { ip: '0.0.0.0' }]],
+                 boot_timeout: 1,
                  graceful_halt_timeout: 0.1),
       validate: []
     )
@@ -76,7 +77,7 @@ def call
                       :provider_config => provider_config,
                       :config => vm_config,
                       :state => double('state', id: nil),
-                      :communicate => double('communicator', :ready? => true),
+                      :communicate => double('communicator', :wait_for_ready => true, :ready? => true),
                       :ssh_info => {},
                       :data_dir => Pathname.new(''),
                       :id => nil,