vagrant-hypervnet 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f024899cc74a4e7385cd03355e8bef3b435890225cff8b0a6148d25b52a86f9
-  data.tar.gz: 1e00433fbdc4d9c3a134eb154c185b186cf8c1188816dd38f80d7af8db92adb7
+  metadata.gz: 544605d534c0917561ad9b958cb089f342f336727a5adcc4d49a3f090b53e2e3
+  data.tar.gz: dc4e721381b9f876de43774067e04b823714c98cc96fba5b34d8874a8abef292
 SHA512:
-  metadata.gz: 57d673018b5faef0970e51671bd53033908c914e5af64d526ff2c41115552686988067d905b347c005ffc1edd9794e70f77be3865784c952e6be517412c7d7d4
-  data.tar.gz: e58247102736397f56cc419b56d3df1940f2f6704c2c7c81cdbb6211b533c98ce9c5710ec2e30818a1798b06bc5b0e0c71e8cc6cc2a67be1d26bbb5d1a54eed6
+  metadata.gz: bce06beb7ad946a45e1effeb1a106788f346925702468d7393eb509b147256888e12b5eb50cbe4956d7d6906f7752899de0ed96790a8b4f2978fe1ae85fac13b
+  data.tar.gz: 23a3c4218e7ced43be5e1b994a3e43bf7ff1e6ff74b8890300e58e9aecd68163de655f0a06d4042606baeb76b9a5a0f01357a90a91ab0736bde702c0e080c314

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

@@ -160,6 +160,7 @@ module VagrantPlugins
               return {
                 type:        :external,
                 switch:      switch[:name],
+                switch_id:   switch[:id]
               }
             else
               raise Errors::NetworkNotFound, name: config[:bridge]
@@ -206,7 +207,25 @@ module VagrantPlugins
           if !switch
             @logger.info("Switch not found. Creating if we can.")
             if !config[:bridge]
-              config[:bridge] = netaddr.to_s
+            index = 0
+              loop do
+                config[:bridge] = netaddr.to_s + (index > 0 ? "_#{index}" : "")
+                exists = @driver.find_switch_by_name(config[:bridge])
+                if !exists
+                  break
+                else
+                  index += 1
+                end
+              end
+            end
+
+            routes = @driver.get_routes
+            @logger.debug("Search if subnet #{netaddr.to_s} is already defined in host: #{routes.inspect} ")
+            existing_route = routes.find{|range| range.include?(netaddr)}
+            if existing_route
+              raise Errors::NetworkAddressOverlapping,
+                address: netaddr,
+                subnet: existing_route
             end
 
             # Create a new switch
@@ -216,6 +235,7 @@ module VagrantPlugins
 
           return {
             switch:      switch[:name],
+            switch_id:   switch[:id],
             type:        :internal
           }
         end
@@ -255,6 +275,7 @@ module VagrantPlugins
           return {
             type:        :private,
             switch:      switch[:name],
+            switch_id:   switch[:id]
           }
         end
 
@@ -273,9 +294,11 @@ module VagrantPlugins
         end
 
         def nat_adapter(config)
+          switch = @driver.find_switch_by_name(@env[:machine].config.hypervnet.default_switch)
           return {
-            type:    :nat,
-            switch:  "Default Switch"
+            type:      :nat,
+            switch:    switch[:name],
+            switch_id: switch[:id]
           }
         end
 
@@ -292,12 +315,12 @@ module VagrantPlugins
           adapters.each.with_index(0) do |adapter, index|   
             if index < vm_adapters.length
               vm_adapter = vm_adapters[index]
-              @logger.info("Connecting adapter #{vm_adapter.inspect} to switch #{adapter[:switch]}")
-              @driver.connect_vm_adapter(vm_adapter[:id], adapter[:switch])
             else
-              vm_adapter = @driver.add_vm_adapter(adapter[:switch])              
+              vm_adapter = @driver.add_vm_adapter              
               @logger.info("Created adapter: #{vm_adapter.inspect}")
             end
+            @logger.info("Connecting adapter #{vm_adapter.inspect} to switch #{adapter[:switch]}")
+            @driver.connect_vm_adapter(vm_adapter[:id], adapter[:switch_id])
           end
 
           if vm_adapters.length > adapters.length

data/lib/vagrant-hypervnet/config.rb

@@ -8,11 +8,13 @@ module VagrantPlugins
 
       attr_accessor :install_ssh_server
       attr_accessor :install_rsync
+      attr_accessor :default_switch
 
       def initialize        
         @network_adapters = []
         @install_ssh_server = UNSET_VALUE
         @install_rsync = UNSET_VALUE
+        @default_switch = UNSET_VALUE
   
         network_adapter(:nat)
       end
@@ -24,6 +26,7 @@ module VagrantPlugins
       def finalize!
         @install_ssh_server = true if @install_ssh_server == UNSET_VALUE
         @install_rsync = true if @install_rsync == UNSET_VALUE
+        @default_switch = "Default Switch" if @default_switch == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-hypervnet/driver.rb

@@ -63,11 +63,19 @@ module VagrantPlugins
       def find_switch_by_name(name)
         data = execute(:get_switch_by_name, Name: name)
         if data && data.kind_of?(Array)
-          data = data[0]
+          if data.length > 1
+            raise Errors::NetworkNotUnique,
+            networks: data.inspect
+          elsif data.length == 1 
+            data = data[0]
+          else
+            data = nil          
+          end
         end
 
         if data
           switch = {}
+          switch[:id] = data["Id"]   
           switch[:name] = data["Name"]          
           switch[:type] = data["SwitchType"]
         end
@@ -78,11 +86,19 @@ module VagrantPlugins
       def find_switch_by_address(ip_address, prefix_length)        
         data = execute(:get_switch_by_address, DestinationPrefix: "#{ip_address}/#{prefix_length}")
         if data && data.kind_of?(Array)
-          data = data[0]
+          if data.length > 1
+            raise Errors::NetworkNotUnique,
+            networks: data.inspect
+          elsif data.length == 1 
+            data = data[0]
+          else
+            data = nil          
+          end
         end
 
         if data
           switch = {}
+          switch[:id] = data["Id"]   
           switch[:name] = data["Name"]          
           switch[:type] = data["SwitchType"]
         end
@@ -118,7 +134,8 @@ module VagrantPlugins
           data.each do |value|
             adapter = {}
             adapter[:id] = value["Id"]
-            adapter[:name] = value["Name"]
+            adapter[:name] = value["Name"]            
+            adapter[:switch_id] = value["SwitchId"]
             adapter[:switch] = value["SwitchName"]
             adapter[:mac_address] = value["MacAddress"]
             adapters << adapter
@@ -127,6 +144,29 @@ module VagrantPlugins
         adapters
       end
 
+      def get_routes
+        routes = []
+        data = execute(:get_routes)
+        if data
+          if data.kind_of?(Hash)
+            data = [] << data
+          end   
+          data.each do |value|
+            begin
+              netaddr = IPAddr.new(value["DestinationPrefix"])
+              if netaddr.prefix > 0
+                routes << netaddr
+              end
+            rescue IPAddr::Error => e
+              raise Vagrant::Errors::NetworkAddressInvalid,
+                address: data["DestinationPrefix"], mask: "",
+                error: e.message
+            end
+          end
+        end        
+        routes
+      end
+
       def create_switch(type, name, ip_address = nil, prefix_length = nil)
         case type
         when :internal
@@ -137,6 +177,7 @@ module VagrantPlugins
 
         if data
           switch = {}
+          switch[:id] = data["Id"]   
           switch[:name] = data["Name"]          
           switch[:type] = data["SwitchType"]
         end
@@ -144,14 +185,12 @@ module VagrantPlugins
         switch
       end
 
-      def add_vm_adapter(switch)
-        data = execute(:add_vm_adapter, VmId: @vmId, SwitchName: switch)
+      def add_vm_adapter
+        data = execute(:add_vm_adapter, VmId: @vmId)
 
         adapter = {}
         adapter[:id] = data["Id"]
         adapter[:name] = data["Name"]
-        adapter[:switch] = data["SwitchName"]
-        adapter[:mac_address] = data["MacAddress"]
    
         adapter        
       end
@@ -160,8 +199,8 @@ module VagrantPlugins
         execute(:remove_vm_adapter, VmId: @vmId, Id: id)        
       end
 
-      def connect_vm_adapter(id, switch)
-        execute(:connect_vm_adapter, VmId: @vmId, Id: id, SwitchName: switch)        
+      def connect_vm_adapter(id, switch_id)
+        execute(:connect_vm_adapter, VmId: @vmId, Id: id, SwitchId: switch_id)        
       end
 
       protected

data/lib/vagrant-hypervnet/errors.rb

@@ -22,6 +22,14 @@ module VagrantPlugins
         error_key(:network_address_invalid)
       end
 
+      class NetworkAddressOverlapping < HyperVNetError
+        error_key(:network_address_overlapping)
+      end      
+
+      class NetworkNotUnique < HyperVNetError
+        error_key(:network_not_unique)
+      end      
+
       class NetworkNotFound < HyperVNetError
         error_key(:network_not_found)
       end

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

@@ -2,14 +2,11 @@
 
 param (
     [parameter (Mandatory=$true)]
-    [string]$VmId,
-    [parameter (Mandatory=$true)]
-    [string]$SwitchName 
-
+    [string]$VmId
 )
 
 $vm = Get-VM -Id $VmId
-$adapter = Add-VMNetworkAdapter -PassThru -VM $vm -SwitchName $SwitchName |
-    Select-Object -Property "Name", "Id", "SwitchName", "MacAddress"
+$adapter = Add-VMNetworkAdapter -PassThru -VM $vm |
+    Select-Object -Property "Name", "Id"
 
 Write-OutputMessage $(ConvertTo-JSON $adapter)

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

@@ -4,9 +4,10 @@ param (
     [parameter (Mandatory=$true)]
     [string]$Id,
     [parameter (Mandatory=$true)]
-    [string]$SwitchName 
+    [string]$SwitchId
 
 )
 
 $vm = Get-VM -Id $VmId
-Get-VMNetworkAdapter -VM $vm | Where-Object -Property Id -EQ -Value $Id | Connect-VMNetworkAdapter -SwitchName $SwitchName
+$switch = Get-VMSwitch -Id $SwitchId
+Get-VMNetworkAdapter -VM $vm | Where-Object -Property Id -EQ -Value $Id | Connect-VMNetworkAdapter -VMSwitch $switch

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

@@ -0,0 +1,5 @@
+#Requires -Modules VagrantMessages
+
+$routes = Get-NetRoute |  Select-Object -Property "DestinationPrefix"
+
+Write-OutputMessage $(ConvertTo-JSON $routes)

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

@@ -11,7 +11,7 @@ foreach($route in  Get-NetRoute | Where-Object -Property DestinationPrefix -EQ -
     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,
+                Select-Object -Property Name, Id,
                     @{Name='SwitchType';Expression={"$($_.SwitchType)"}},
                     @{Name='NetAdapter';Expression={$switch_adapter[$_.Name]}}) {
                       $switches += $switch

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

@@ -8,7 +8,7 @@ param (
  $switches = @()
 
  foreach($switch in Get-VMSwitch | Where-Object -Property Name -EQ -Value  $Name |
-    Select-Object -Property Name,
+    Select-Object -Property Name, Id,
         @{Name='SwitchType';Expression={"$($_.SwitchType)"}},
         @{Name='NetAdapter';Expression={$switch_adapter[$_.Name]}}) {
             $switches += $switch

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

@@ -6,6 +6,6 @@ param (
 )
 $vm = Get-VM -Id $VmId
 $adapters = Get-VMNetworkAdapter -VM $vm |
-    Select-Object -Property "Name", "Id", "SwitchName", "MacAddress"
+    Select-Object -Property "Name", "Id", "SwitchName", "SwitchId", "MacAddress"
 
 Write-OutputMessage $(ConvertTo-JSON $adapters)

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

@@ -20,7 +20,7 @@ param (
     New-NetIPAddress -IPAddress $IPAddress -PrefixLength $PrefixLength -InterfaceIndex $adapter.ifIndex
  }
    
-Write-OutputMessage $($switch | Select-Object -Property Name,
+Write-OutputMessage $($switch | Select-Object -Property Name, Id,
    @{Name='SwitchType';Expression={"$($_.SwitchType)"}},
    @{Name='NetAdapter';Expression={$switch_adapter[$_.Name]}} |
    ConvertTo-JSON)

data/lib/vagrant-hypervnet/version.rb

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

data/locales/en.yml

@@ -62,6 +62,16 @@ en:
           Address: %{address}
           Netmask: %{mask}
           Error: %{error}
+      network_address_overlapping: |-
+        The IP address configured for the host-only network is overlapping
+        a subnet already defined. Please update the address used and run the command again.
+
+          Address: %{address}
+          Subnet: %{subnet}
+      network_not_unique: |-
+        The specified host network match morte then one item:
+        
+          Networks: '%{networks}.'        
       network_not_found: |-
         The specified host network could not be found: '%{name}.'
         If the name specification is removed, Vagrant will create a new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hypervnet
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Luca Bompani
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-06 00:00:00.000000000 Z
 dependencies: []
 description: Vagrant plugin which extends Hyper-V provider implementing networks creation
   and configuration.
@@ -38,6 +38,7 @@ files:
 - lib/vagrant-hypervnet/errors.rb
 - lib/vagrant-hypervnet/scripts/add_vm_adapter.ps1
 - lib/vagrant-hypervnet/scripts/connect_vm_adapter.ps1
+- lib/vagrant-hypervnet/scripts/get_routes.ps1
 - lib/vagrant-hypervnet/scripts/get_switch_by_address.ps1
 - lib/vagrant-hypervnet/scripts/get_switch_by_name.ps1
 - lib/vagrant-hypervnet/scripts/get_vm_adapters.ps1