vagrant-hypervnet 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 544605d534c0917561ad9b958cb089f342f336727a5adcc4d49a3f090b53e2e3
-  data.tar.gz: dc4e721381b9f876de43774067e04b823714c98cc96fba5b34d8874a8abef292
+  metadata.gz: 133edcbb24475749a9bf3de3cb1bad3cb0066564b573d88fc85ca83fc49b0213
+  data.tar.gz: 586660e79703b88479704cbf69f6ea216d61e996de05d5a2e3956cd583073d3f
 SHA512:
-  metadata.gz: bce06beb7ad946a45e1effeb1a106788f346925702468d7393eb509b147256888e12b5eb50cbe4956d7d6906f7752899de0ed96790a8b4f2978fe1ae85fac13b
-  data.tar.gz: 23a3c4218e7ced43be5e1b994a3e43bf7ff1e6ff74b8890300e58e9aecd68163de655f0a06d4042606baeb76b9a5a0f01357a90a91ab0736bde702c0e080c314
+  metadata.gz: c19f6e3e2c6bdcdeecd9603375bbf03dc59d746c3f09789cf9b0c2b9c45d3b15aa287df6e2a60129559119be77d287de4e29a6fee3e64253f8333377c773df03
+  data.tar.gz: 38870404a84145c4217a7f80d6141f5a676f54086f8d8c620d239bba590cd32d312a6c53bd62196e1f278a3dc31176a431b88344fe487d4ef4b8fde8d450d61c

data/README.md

@@ -25,18 +25,41 @@ $ vagrant plugin install vagrant-hypervnet
 ```ruby
 Vagrant.configure("2") do |config|
   
-  # install OpenSSH Server (Windows Capability) and insert vagrant ssh key on windows guests 
+  # installs OpenSSH Server (Windows Capability) and inserts vagrant ssh key on windows guests 
   config.hypervnet.install_ssh_server = true
   
-  # install MSYS2 and rsync on windows guests
+  # installs MSYS2 and rsync on windows guests
   config.hypervnet.install_rsync = true
+
+  # enablee synced_folder synchronization before provision
+  config.hypervnet.folder_sync_on_provision = true
+
+  # Hyper-V switch connected to vagrant management interface
+  config.hypervnet.default_switch = "Default Switch"
+
+  # Hyper-V internal network: a new switch is created if can't find an existent switch with the specified subnet (192.168.100.100/24)
+  config.vm.network :private_network, ip: "192.168.100.101", netmask: "255.255.255.0"
+
+# Hyper-V internal network: a new switch is created if can't find an existent switch whith the specified name ("my-internal-network") 
+  config.vm.network :private_network, ip: "192.168.102.101", netmask: "255.255.255.0" hyperv__bridge: "my-internal-network"  
+
+  # Hyper-V private network: a new switch is created if can't find an existent switch whith the specified name ("my-private-network") 
+  config.vm.network :private_network, ip: "192.168.101.101", netmask: "255.255.255.0" hyperv__private: "my-private-network"
+
+  # Hyper-V external network: the existent switch whith the specified name ("my-external-network") is connected to this vm adapter
+  config.vm.network :public_network, ip: "192.168.102.101", netmask: "255.255.255.0" hyperv__bridge: "my-external-network"
+
+  # rsync synched folder
+  config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: ".git"
 end
 ```
 
 ### Config options
 
-* `install_ssh_server` (Boolean, default: `true`): install OpenSSH Server (Windows Capability) and insert vagrant ssh key on windows guests.
-* `install_rsync` (Boolean, default: `true`): install MSYS2 and rsync on windows guests.
+* `install_ssh_server` (Boolean, default: `true`): installs OpenSSH Server (Windows Capability) and inserts vagrant ssh key on windows guests.
+* `install_rsync` (Boolean, default: `true`): installs MSYS2 and rsync on windows guests if an rsync synced folder is defined .
+* `folder_sync_on_provision` (Boolean, default: `true`): if enabled invokes synced folders synchronization before provision.
+* `default_switch` (String, default: `Default Switch`): Hyper-V switch connected to interface used by vagrant to communicate with the vm.
 
 ## Usage
 

data/lib/vagrant-hypervnet/action/folder_sync.rb

@@ -0,0 +1,28 @@
+require "log4r"
+
+module VagrantPlugins
+  module HyperVNet    
+    module Action
+      class FolderSync
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::hypervnet::folder_sync")
+        end
+
+        def call(env)
+          # Continue the middleware chain.
+          @app.call(env)
+
+          machine = env[:machine]
+          if(machine.config.hypervnet.folder_sync_on_provision)
+            env[:ui].output(I18n.t("vagrant_hypervnet.folder_sync"))
+            callable = Vagrant::Action::Builder.new
+            callable.use Vagrant::Action::Builtin::SyncedFolders
+            machine.action_raw(:sync_folders, callable, env)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-hypervnet/action.rb

@@ -1,6 +1,7 @@
 require_relative 'action/disable_builtin_network_configure'
 require_relative 'action/network'
 require_relative 'action/ssh_server'
+require_relative 'action/folder_sync'
 
 module VagrantPlugins
   module HyperVNet
@@ -26,6 +27,14 @@ module VagrantPlugins
           builder.use SshServer
         end
       end
+
+      def self.folder_sync
+        Vagrant::Action::Builder.new.tap do |builder|
+          builder.use ConfigValidate
+          builder.use FolderSync
+        end
+      end
+
     end
   end
 end

data/lib/vagrant-hypervnet/config.rb

@@ -8,12 +8,14 @@ module VagrantPlugins
 
       attr_accessor :install_ssh_server
       attr_accessor :install_rsync
+      attr_accessor :folder_sync_on_provision
       attr_accessor :default_switch
 
       def initialize        
         @network_adapters = []
         @install_ssh_server = UNSET_VALUE
         @install_rsync = UNSET_VALUE
+        @folder_sync_on_provision = UNSET_VALUE
         @default_switch = UNSET_VALUE
   
         network_adapter(:nat)
@@ -26,6 +28,7 @@ module VagrantPlugins
       def finalize!
         @install_ssh_server = true if @install_ssh_server == UNSET_VALUE
         @install_rsync = true if @install_rsync == UNSET_VALUE
+        @folder_sync_on_provision = true if @folder_sync_on_provision == UNSET_VALUE
         @default_switch = "Default Switch" if @default_switch == UNSET_VALUE
       end
 

data/lib/vagrant-hypervnet/scripts/add_vm_adapter.ps1

@@ -5,8 +5,14 @@ param (
     [string]$VmId
 )
 
-$vm = Get-VM -Id $VmId
-$adapter = Add-VMNetworkAdapter -PassThru -VM $vm |
-    Select-Object -Property "Name", "Id"
+try{
+    $vm = Get-VM -Id $VmId
+    $adapter = Add-VMNetworkAdapter -PassThru -VM $vm |
+        Select-Object -Property "Name", "Id"
+}
+catch {
+    Write-ErrorMessage "Failed to add adapter to VM ${VmId}: ${PSItem}"
+    exit 1            
+ }
 
 Write-OutputMessage $(ConvertTo-JSON $adapter)

data/lib/vagrant-hypervnet/scripts/connect_vm_adapter.ps1

@@ -8,6 +8,12 @@ param (
 
 )
 
-$vm = Get-VM -Id $VmId
-$switch = Get-VMSwitch -Id $SwitchId
-Get-VMNetworkAdapter -VM $vm | Where-Object -Property Id -EQ -Value $Id | Connect-VMNetworkAdapter -VMSwitch $switch
+try {
+    $vm = Get-VM -Id $VmId
+    $switch = Get-VMSwitch -Id $SwitchId
+    Get-VMNetworkAdapter -VM $vm | Where-Object -Property Id -EQ -Value $Id | Connect-VMNetworkAdapter -VMSwitch $switch
+}
+catch {
+    Write-ErrorMessage "Failed to connect adapter ${Id} of VM ${VmId} to switch ${SwitchId}: ${PSItem}"
+    exit 1            
+ }

data/lib/vagrant-hypervnet/scripts/get_routes.ps1

@@ -1,5 +1,11 @@
 #Requires -Modules VagrantMessages
 
-$routes = Get-NetRoute |  Select-Object -Property "DestinationPrefix"
+try {
+    $routes = Get-NetRoute |  Select-Object -Property "DestinationPrefix"
+}
+catch {
+    Write-ErrorMessage "Failed to get host routes: ${PSItem}"
+    exit 1            
+}
 
 Write-OutputMessage $(ConvertTo-JSON $routes)

data/lib/vagrant-hypervnet/scripts/get_switch_by_address.ps1

@@ -7,16 +7,24 @@ param (
 
 $switches = @()
 
-foreach($route in  Get-NetRoute | Where-Object -Property DestinationPrefix -EQ -Value $DestinationPrefix) {
-    foreach($adapter in Get-NetAdapter -InterfaceIndex $route.ifIndex) {
-        foreach($vmAdapter in Get-VMNetworkAdapter -ManagementOS | Where-Object -Property DeviceId -EQ -Value $adapter.DeviceId) {
-            foreach($switch in Get-VMSwitch -Name $vmAdapter.SwitchName |
-                Select-Object -Property Name, Id,
-                    @{Name='SwitchType';Expression={"$($_.SwitchType)"}},
-                    @{Name='NetAdapter';Expression={$switch_adapter[$_.Name]}}) {
-                      $switches += $switch
-                    }
+try {
+    foreach($route in  Get-NetRoute | Where-Object -Property DestinationPrefix -EQ -Value $DestinationPrefix) {
+        foreach($adapter in Get-NetAdapter -InterfaceIndex $route.ifIndex) {
+            foreach($vmAdapter in Get-VMNetworkAdapter -ManagementOS | Where-Object -Property DeviceId -EQ -Value $adapter.DeviceId) {
+                foreach($switch in Get-VMSwitch -Name $vmAdapter.SwitchName |
+                    Select-Object -Property Name, Id,
+                        @{Name='SwitchType';Expression={"$($_.SwitchType)"}},
+                        @{Name='NetAdapter';Expression={$switch_adapter[$_.Name]}}) {
+                        $switches += $switch
+                        }
+            }
         }
     }
 }
+catch {
+    Write-ErrorMessage "Failed to find switch by IP ${DestinationPrefix}: ${PSItem}"
+    exit 1            
+}
+
+
 Write-OutputMessage $(ConvertTo-JSON $switches)

data/lib/vagrant-hypervnet/scripts/get_switch_by_name.ps1

@@ -7,11 +7,17 @@ param (
 
  $switches = @()
 
- foreach($switch in Get-VMSwitch | Where-Object -Property Name -EQ -Value  $Name |
-    Select-Object -Property Name, Id,
-        @{Name='SwitchType';Expression={"$($_.SwitchType)"}},
-        @{Name='NetAdapter';Expression={$switch_adapter[$_.Name]}}) {
-            $switches += $switch
-        }
+ try {
+    foreach($switch in Get-VMSwitch | Where-Object -Property Name -EQ -Value  $Name |
+        Select-Object -Property Name, Id,
+            @{Name='SwitchType';Expression={"$($_.SwitchType)"}},
+            @{Name='NetAdapter';Expression={$switch_adapter[$_.Name]}}) {
+                $switches += $switch
+            }
+}
+catch {
+    Write-ErrorMessage "Failed to find switch by name ${Name}: ${PSItem}"
+    exit 1            
+}
 
 Write-OutputMessage $(ConvertTo-JSON $switches)

data/lib/vagrant-hypervnet/scripts/get_vm_adapters.ps1

@@ -4,8 +4,15 @@ param (
     [parameter (Mandatory=$true)]
     [string]$VmId
 )
-$vm = Get-VM -Id $VmId
-$adapters = Get-VMNetworkAdapter -VM $vm |
+
+try {
+    $vm = Get-VM -Id $VmId
+    $adapters = Get-VMNetworkAdapter -VM $vm |
     Select-Object -Property "Name", "Id", "SwitchName", "SwitchId", "MacAddress"
+}
+catch {
+    Write-ErrorMessage "Failed to get adapters of VM ${VmId}: ${PSItem}"
+    exit 1            
+}
 
 Write-OutputMessage $(ConvertTo-JSON $adapters)

data/lib/vagrant-hypervnet/scripts/new_switch.ps1

@@ -12,12 +12,24 @@ param (
 
  )
 
- $switch = New-VMSwitch -Name $Name -SwitchType $SwitchType
+ try {
+   $switch = New-VMSwitch -Name $Name -SwitchType $SwitchType
+ }
+ catch {
+   Write-ErrorMessage "Failed to create switch ${Name}: ${PSItem}"
+   exit 1
+ }
 
  if($IPAddress) {
-    $vmAdapter = Get-VMNetworkAdapter -ManagementOS -SwitchName $switch.Name
-    $adapter = Get-NetAdapter | Where-Object -Property DeviceId -EQ -Value $vmAdapter.DeviceId
-    New-NetIPAddress -IPAddress $IPAddress -PrefixLength $PrefixLength -InterfaceIndex $adapter.ifIndex
+   try {
+      $vmAdapter = Get-VMNetworkAdapter -ManagementOS | Where-Object -Property SwitchId -EQ -Value  $switch.Id
+      $adapter = Get-NetAdapter | Where-Object -Property DeviceId -EQ -Value $vmAdapter.DeviceId
+      New-NetIPAddress -IPAddress $IPAddress -PrefixLength $PrefixLength -InterfaceIndex $adapter.ifIndex         
+   }
+   catch {
+      Write-ErrorMessage "Failed to add IP address ${IPAddress} for switch ${Name}: ${PSItem}"
+      exit 1            
+   }
  }
    
 Write-OutputMessage $($switch | Select-Object -Property Name, Id,

data/lib/vagrant-hypervnet/scripts/remove_vm_adapter.ps1

@@ -5,5 +5,11 @@ param (
     [string]$Id
 )
 
-$vm = Get-VM -Id $VmId
-Get-VMNetworkAdapter -VM $vm | Where-Object -Property Id -EQ -Value $Id | Remove-VMNetworkAdapter
+try {
+    $vm = Get-VM -Id $VmId
+    Get-VMNetworkAdapter -VM $vm | Where-Object -Property Id -EQ -Value $Id | Remove-VMNetworkAdapter
+}
+catch {
+    Write-ErrorMessage "Failed to remove adapter ${Id} from VM ${VmId}: ${PSItem}"
+    exit 1            
+ }

data/lib/vagrant-hypervnet/version.rb

@@ -2,6 +2,6 @@
 
 module VagrantPlugins
   module HyperVNet
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

data/lib/vagrant-hypervnet.rb

@@ -84,6 +84,12 @@ module VagrantPlugins
         end
         hook.before(Vagrant::Action::Builtin::SyncedFolders, Action.ssh_server)
       end
+
+      action_hook(:hypervnet, :provision) do |hook|              
+        require_relative 'vagrant-hypervnet/action'
+
+        hook.after(Vagrant::Action::Builtin::Provision, Action.folder_sync)        
+      end
     end
   end
 end

data/locales/en.yml

@@ -4,6 +4,8 @@ en:
       Adapter %{adapter}: %{type} %{switch}
     network_config: |-
       network %{network} -> %{interface}: %{type} %{ip}/%{netmask}
+    folder_sync: |-
+      Synchronizing synchronized folders...
     ssh:
       install: |-
         Installing OpenSSH server to the VM...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hypervnet
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Luca Bompani
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies: []
 description: Vagrant plugin which extends Hyper-V provider implementing networks creation
   and configuration.
@@ -25,6 +25,7 @@ files:
 - lib/vagrant-hypervnet.rb
 - lib/vagrant-hypervnet/action.rb
 - lib/vagrant-hypervnet/action/disable_builtin_network_configure.rb
+- lib/vagrant-hypervnet/action/folder_sync.rb
 - lib/vagrant-hypervnet/action/network.rb
 - lib/vagrant-hypervnet/action/ssh_server.rb
 - lib/vagrant-hypervnet/cap.rb