vagrant-windows-hyperv 1.0.2 → 1.0.3

data/lib/vagrant-windows-hyperv/monkey_patch/scripts/switch_exist.ps1

@@ -0,0 +1,54 @@
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved. Licensed under the MIT License.
+#--------------------------------------------------------------------------
+
+param (
+    [Parameter(Mandatory=$true)]
+    [string]$type,
+    [Parameter(Mandatory=$true)]
+    [string]$name
+ )
+
+ # Include the following modules
+$Dir = Split-Path $script:MyInvocation.MyCommand.Path
+. ([System.IO.Path]::Combine($Dir, "utils\write_messages.ps1"))
+
+try {
+  if ($type -eq "external") {
+    $switch_exist = Get-VMSwitch -SwitchType  "$type"
+    if ($switch_exist) {
+      $switch_name = $switch_exist.name
+      $resptHash = @{
+        message = "switch exist"
+        switch_name = "$switch_name"
+      }
+      Write-Output-Message $(ConvertTo-JSON $resptHash)
+      return
+    }
+  }
+
+  $switch_exist = (Get-VMSwitch -SwitchType  "$type" `
+    | Select-Object Name `
+    | Where-Object { $_.name -eq $name })
+  if ($switch_exist) {
+    $switch_name = $switch_exist.name
+    $resptHash = @{
+      message = "switch exist"
+      switch_name = "$switch_name"
+    }
+  } else {
+    $resptHash = @{
+      message = "switch not exist"
+      switch_name = "$name"
+    }
+  }
+    Write-Output-Message $(ConvertTo-JSON $resptHash)
+    return
+} catch {
+  $errortHash = @{
+    type = "PowerShellError"
+    error = "$_"
+  }
+  Write-Error-Message $(ConvertTo-JSON $errortHash)
+}

data/lib/vagrant-windows-hyperv/monkey_patch/scripts/utils/write_messages.ps1

@@ -0,0 +1,20 @@
+#-------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved. Licensed under the MIT License.
+#--------------------------------------------------------------------------
+
+function Write-Error-Message($message) {
+  $error_message = @{
+    error = "$message"
+  }
+  Write-Host "===Begin-Error==="
+  $result =  ConvertTo-json $error_message
+  Write-Host $result
+  Write-Host "===End-Error==="
+}
+
+function Write-Output-Message($message) {
+  Write-Host "===Begin-Output==="
+  Write-Host $message
+  Write-Host "===End-Output==="
+}

data/lib/vagrant-windows-hyperv/provisioner/puppet.rb

@@ -42,7 +42,7 @@ module VagrantPlugins
             module_paths.unshift("/ProgramData/PuppetLabs/puppet/etc/modules")
 
             # Add the command line switch to add the module path
-            options << "--modulepath \"#{module_paths.join(':')}\""
+            options << "--modulepath \"#{module_paths.join(';')}\""
           end
 
           if @hiera_config_path
@@ -64,7 +64,7 @@ module VagrantPlugins
           if !config.facter.empty?
             facts = []
             config.facter.each do |key, value|
-              facts << "FACTER_#{key}='#{value}'"
+              facts << "FACTER_#{key}=\"#{value}\""
             end
 
             facter = "#{facts.join(" ")} "

data/lib/vagrant-windows-hyperv/scripts/check_winrm.ps1

@@ -16,8 +16,12 @@ $presentDir = Split-Path -parent $PSCommandPath
 try {
   $response = Create-Remote-Session $guest_ip $username $password
   if (!$response["session"] -and $response["error"]) {
-      Write-Host $response["error"]
-      return
+    $session_message = $response['error']
+    $resultHash = @{
+      message = "$session_message"
+    }
+    Write-Output-Message $resultHash
+    return
   }
     function Remote-Execute() {
       $winrm_state = ""
@@ -34,7 +38,7 @@ try {
   } catch {
     $errortHash = @{
       type = "PowerShellError"
-      error ="Failed to copy file $_"
+      error ="$_"
     }
     Write-Error-Message $errortHash
     return

data/lib/vagrant-windows-hyperv/scripts/upload_file.ps1

@@ -20,9 +20,35 @@ $presentDir = Split-Path -parent $PSCommandPath
 try {
   # Enable Guest Service Interface if they are disabled
   try {
-    Get-VM -Id $vm_id | Get-VMIntegrationService -Name "Guest Service Interface" | Enable-VMIntegrationService -Passthru
+    $Operational = $null
+    $maxAttempt = 5
+    do {
+       $maxAttempt = $maxAttempt - 1
+       $Operational = Get-VM -Id $vm_id | Get-VMIntegrationService -Name "Guest Service Interface"
+       if (-not $Operational.Enabled) {
+        Get-VM  -Id $vm_id | Get-VMIntegrationService -Name "Guest Service Interface"  | Enable-VMIntegrationService -Passthru
+        sleep 1
+        }
+      }
+      While ( !$Operational.Enabled -and $maxAttempt -gt 0 )
+    }
+    catch {
+      $errortHash = @{
+        type = "PowerShellError"
+        error = "$_"
+      }
+      Write-Error-Message $errortHash
+      return
+     }
+
+  if (!$Operational -or !$Operational.ENabled) {
+    $errortHash = @{
+      type = "PowerShellError"
+      error = "Could not enable Guest Service Interface."
     }
-    catch { }
+    Write-Error-Message $errortHash
+    return
+  }
 
   function Upload-FIle-To-VM($host_path, $guest_path, $machine) {
     Write-Host $host_path
@@ -35,7 +61,7 @@ try {
     if (!$response["session"] -and $response["error"]) {
       $errortHash = @{
         type = "PowerShellError"
-        message = $response["error"]
+        error = $response["error"]
       }
       Write-Error-Message $errorResult
       return

data/lib/vagrant-windows-hyperv/scripts/utils/create_session.ps1

@@ -13,6 +13,8 @@ function Create-Remote-Session($guest_ip, $username, $password) {
     $count = 0
     $session_error = ""
     $session = ""
+    $max_attempts = 5
+    $sleep_for_sec = 5
     do {
         $count++
         try {
@@ -20,15 +22,27 @@ function Create-Remote-Session($guest_ip, $username, $password) {
             $session_error = ""
         }
         catch {
-            Start-Sleep -s 1
-            $session_error = $_
-            $session = ""
+            $session_error = $_.Exception.message
+            if ($_.FullyQualifiedErrorID -eq "AccessDenied,PSSessionOpenFailed") {
+                $count = $max_attempts
+            }
+            elseif ($_FullyQualifiedErrorID -eq "CannotUseIPAddress,PSSessionOpenFailed") {
+                $count = $max_attempts
+            }
+            elseif ( $_.FullyQualifiedErrorID -eq "WinRMOperationTimeout,PSSessionOpenFailed") {
+                Start-Sleep -s $sleep_for_sec
+                $session = ""
+            }
+            else {
+                Start-Sleep -s $sleep_for_sec
+                $session = ""
+            }
         }
     }
-    while (!$session -and $count -lt 20)
+    while (!$session -and $count -lt $max_attempts)
 
     return  @{
         session = $session
-        error = $session_error
+        error = "$session_error"
     }
 }

data/lib/vagrant-windows-hyperv/version.rb

@@ -5,6 +5,6 @@
 
 module VagrantPlugins
   module VagrantHyperV
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/locales/en.yml

@@ -5,11 +5,68 @@ en:
       RDP session and enter the Virtual Machine's password.
     message_rdp_not_ready: |-
         Hyper-V machine isn't running. Can't RDP in!
+    choose_adapter: |-
+      Please select a adapter from the available network adapters.
+    choose_switch: |-
+      Please choose a switch to attach to your Hyper-V instance.
+      If none of these are appropriate, please open the Hyper-V manager
+      to create a new virtual switch.
+    virtual_switch_info: |-
+      Vagrant works well with Hyper-V's External Switch. If you are using an Internal switch
+      please make sure that this switch is properly configured for network connection.
+      The virtual machine must be reachable from the host for Vagrant to work.
+    no_private_switch: |-
+      Vagrant cannot work with Hyper-V's private switch, since this configuration
+      will not allow the host to communicate with the VM. Please refer to Hyper-V's
+      virtual switch configuration for more information.
+    external_switch_exists: |-
+      Hyper-V allows to have only one external switch. There is one already available.
+      Please check the Virtual Switch Manager in Hyper-V Manager.
+      Ignoring the customization and moving on.
+    private_switch_not_allowed: |-
+      Vagrant cannot work with Hyper-V's private switch, since this configuration
+      will not allow the host to communicate with the VM. Please refer to Hyper-V's
+      virtual switch configuration for more information.
+    internal_switch_warn: |-
+      Vagrant works best with Hyper-V's External Switch. If you are using an
+      Internal switch please make sure that this switch is properly configured
+      for network connection. The virtual machine must be reachable from the
+      host for Vagrant to work.
+    net_adapter_warn: |-
+      You seems to have provided an invalid adapter, please choose one from
+      the available list of adapters.
+    creating_switch: |-
+      Creating a virtual switch of type "%{type}" with name "%{name}"
+    add_switch_to_vm: |-
+      Setting the VM to use a Virtual switch of type "%{type}" with name "%{name}"
+
     errors:
       ssh_not_available: |-
         SSH is available for non windows guest. Vagrant detected guest to be %{guest}
       rdp_not_available: |-
         RDP is available for windows guest. Vagrant detected guest to be %{guest}
-      win_rm_not_ready: |-
-        WinRM is not enabled in the remot guest. Vagrant-Windows-HyperV uses remote PowerShell scripts
-        to communicate to the remote machine. Please check the same and try again.
+      win_rm_not_available: |-
+        Vagrant failed to communicate to the VM using powershell. The operation failed
+        with the following message.
+        %{message}
+      no_network_adapter: |-
+        No Network adapter is connected to this VM. Please use the HyperV Manage to add a network adapter.
+      no_switches: |-
+        There are no virtual switches created for Hyper-V! Please open
+        the Hyper-V Manager, go to the "Virtual Switch Manager", and create
+        at least one virtual switch.
+        A virtual switch is required for Vagrant to create a Hyper-V
+        machine that is connected to a network so it can access it.
+        You can also use the customize option to add a virtual switch to this VM.
+        For more help, please see the documentation on the Vagrant website
+        for Hyper-V.
+      network_down: |-
+        The host network seems to be down, this generally happens while creating an
+        external network, it looked like Hyper-V manager took a long time to bring back
+        the network. Please check the network connection and try again.
+      switch_not_found: |-
+        A Virtual switch of type "%{type}" and name "%{name}" is not found, please
+        create the same using Hyper-V "Virtual Switch Manager".
+      external_switch_exist: |-
+        Hyper-V allows to have only one external switch. There already exist one
+        with name "%{name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-hyperv
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - MSOpenTech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -100,6 +100,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - example_box/metadata.json
 - Gemfile
 - lib/vagrant-windows-hyperv/action/export.rb
@@ -113,10 +114,21 @@ files:
 - lib/vagrant-windows-hyperv/errors.rb
 - lib/vagrant-windows-hyperv/guest/cap/halt.rb
 - lib/vagrant-windows-hyperv/guest/windows.rb
+- lib/vagrant-windows-hyperv/monkey_patch/action/customize.rb
+- lib/vagrant-windows-hyperv/monkey_patch/action/import.rb
 - lib/vagrant-windows-hyperv/monkey_patch/action/provision.rb
+- lib/vagrant-windows-hyperv/monkey_patch/action.rb
+- lib/vagrant-windows-hyperv/monkey_patch/config.rb
+- lib/vagrant-windows-hyperv/monkey_patch/driver.rb
 - lib/vagrant-windows-hyperv/monkey_patch/machine.rb
 - lib/vagrant-windows-hyperv/monkey_patch/plugins/synced_folders/smb/synced_folders.rb
-- lib/vagrant-windows-hyperv/monkey_patch/util/powershell.rb
+- lib/vagrant-windows-hyperv/monkey_patch/scripts/add_switch_to_vm.ps1
+- lib/vagrant-windows-hyperv/monkey_patch/scripts/create_switch.ps1
+- lib/vagrant-windows-hyperv/monkey_patch/scripts/find_vm_switch_name.ps1
+- lib/vagrant-windows-hyperv/monkey_patch/scripts/get_adapters.ps1
+- lib/vagrant-windows-hyperv/monkey_patch/scripts/import_vm.ps1
+- lib/vagrant-windows-hyperv/monkey_patch/scripts/switch_exist.ps1
+- lib/vagrant-windows-hyperv/monkey_patch/scripts/utils/write_messages.ps1
 - lib/vagrant-windows-hyperv/plugin.rb
 - lib/vagrant-windows-hyperv/provider.rb
 - lib/vagrant-windows-hyperv/provisioner/chef_solo.rb

data/lib/vagrant-windows-hyperv/monkey_patch/util/powershell.rb

@@ -1,37 +0,0 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-
-require "#{Vagrant::source_root}/lib/vagrant/util/which"
-require "#{Vagrant::source_root}/lib/vagrant/util/subprocess"
-
-module Vagrant
-  module Util
-    # Executes PowerShell scripts.
-    #
-    # This is primarily a convenience wrapper around Subprocess that
-    # properly sets powershell flags for you.
-    class PowerShell
-      # Monkey patch to fix a bug with Vagrant 1.5.1.
-      # https://github.com/mitchellh/vagrant/issues/3192.
-      # This has been fixed in 1.5.2. by
-      # https://github.com/jyggen/vagrant/commit/d7320399e2497aae9b9c3fa83d94b7210d21bfb5
-      def self.execute(path, *args, **opts, &block)
-        command = [
-          "powershell",
-          "-NoProfile",
-          "-ExecutionPolicy", "Bypass",
-          "&('#{path}')",
-          args
-        ].flatten
-
-        # Append on the options hash since Subprocess doesn't use
-        # Ruby 2.0 style options yet.
-        command << opts
-
-        Subprocess.execute(*command, &block)
-      end
-    end
-  end
-end