vagrant-zones 0.1.99 → 0.1.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2597df7f5e76aadf6d3415e4dafe33af5029f0e2c8975e23dbe599d64d0c0755
-  data.tar.gz: 362b02ad488fb43f98d0ca954a3d934fbb247ba684d49ab8aec23f97b09eb60f
+  metadata.gz: b58a4f65279cdf4fd1ef75666dfad9977f8003c77d6b228672a126d4a436f76a
+  data.tar.gz: b48932d77bd5cbe24e35678f5ed4a13a0be2ac04cfd0fba11f4a6d72048584c8
 SHA512:
-  metadata.gz: 1c570fc6fc3aa56962c3b6da0ce3d4a95dd78cb5d41dbf27af426a331842e4d6084da3a7dc62a7b897911050fc2a88d4fcbfa6ea0305df408669b1f531b86117
-  data.tar.gz: 0a5f59044ce1e5524fe044858de4757932a05f84341dca3c8eaafcff4e9ab12ce1187c871639d6eba79bfa68577f86ef362affe1c72c138eae42d55926534d68
+  metadata.gz: acaa60b70fc4dd5a51c7adafb54995629ded5e95884c86ce8cd2b43d1a0745756e7044a59496f5603b203e24bc9a2894b40fdfece7227cd0001deb167579d199
+  data.tar.gz: 60e9a8a9ca5b93603740742c56e5250f62b9e848515ef10e8889e17c39d0d46c4ba57ea032eb2d4284ede6c51b49814f00c7ed4c5859398f041e3b66604926c8

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [0.1.101](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.100...v0.1.101) (2025-05-09)
+
+
+### Bug Fixes
+
+* windows zoneniczloginsetup ([c0eef21](https://github.com/STARTcloud/vagrant-zones/commit/c0eef2157555d668d0a55dddfcbdb2ea419a623d))
+* windows zoneniczloginsetup ([68581e3](https://github.com/STARTcloud/vagrant-zones/commit/68581e37c4c9dd7353ccdfabdc7a5937f5c6a555))
+
+## [0.1.100](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.99...v0.1.100) (2025-05-09)
+
+
+### Bug Fixes
+
+* adding ansi-strings to fix issue with windows output ([bc67454](https://github.com/STARTcloud/vagrant-zones/commit/bc674546d79419496bb781c7aabf2004126c29a5))
+* linting file ([0455ae0](https://github.com/STARTcloud/vagrant-zones/commit/0455ae0677dc593dea0b43f66ac64ba1930b274f))
+* linting file ([9996594](https://github.com/STARTcloud/vagrant-zones/commit/999659499ca65153527ac9222a500b0fefaf0014))
+* linting file ([0e6c345](https://github.com/STARTcloud/vagrant-zones/commit/0e6c34515147617d6f0d233d7400d65515eea2cd))
+
 ## [0.1.99](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.98...v0.1.99) (2025-05-04)
 
 

data/Gemfile

@@ -22,4 +22,5 @@ group :plugins do
   gem 'rubocop-rake', '~> 0.6', '>= 0.6.0'
   gem 'rubocop-rspec', '~> 2.4', '>= 2.4.0'
   gem 'ruby-progressbar', '~> 1.11', '>= 1.11.0'
+  gem 'strings-ansi', '~> 0.2.0'
 end

data/lib/vagrant-zones/driver.rb

@@ -15,6 +15,7 @@ require 'resolv'
 require 'vagrant-zones/util/timer'
 require 'vagrant-zones/util/subprocess'
 require 'vagrant/util/retryable'
+require 'strings/ansi'
 
 module VagrantPlugins
   module ProviderZone
@@ -1344,20 +1345,74 @@ module VagrantPlugins
         uii.info(I18n.t('vagrant_zones.configure_win_interface_using_vnic'))
         sleep(60)
 
-        ## Insert code to get the list of interfaces by mac address in order
-        ## to set the proper VNIC name if using multiple adapters
-        rename_adapter = %(netsh interface set interface name = "Ethernet" newname = "#{vnic_name}")
-        cmd = %(netsh interface ipv4 set address name="#{vnic_name}" static #{ip} #{opts[:netmask]} #{defrouter})
-        uii.info(I18n.t('vagrant_zones.win_applied_rename_adapter')) if zlogin(uii, rename_adapter)
-        uii.info(I18n.t('vagrant_zones.win_applied_static')) if zlogin(uii, cmd)
-        return unless opts[:dns].nil?
-
-        ip_addresses = dnsservers(uii, opts).map { |hash| hash['nameserver'] }
-        dns1 = %(netsh int ipv4 set dns name="#{vnic_name}" static #{ip_addresses[0]} primary validate=no)
-        uii.info(I18n.t('vagrant_zones.win_applied_dns1')) if zlogin(uii, dns1)
-        ip_addresses[1..].each_with_index do |dns, index|
-          additional_nameservers = %(netsh int ipv4 add dns name="#{vnic_name}" #{dns} index="#{index + 2}" validate=no)
-          uii.info(I18n.t('vagrant_zones.win_applied_dns2')) if zlogin(uii, additional_nameservers)
+        # Get the MAC address for this VNIC (if set to auto)
+        mac = macaddress(uii, opts)
+        if mac == 'auto'
+          mac = ''
+          cmd = "#{@pfexec} dladm show-vnic #{vnic_name} | tail -n +2 |  awk '{ print $4 }'"
+          vnicmac = execute(false, cmd.to_s)
+          vnicmac.split(':').each { |x| mac += "#{format('%02x', x.to_i(16))}:" }
+          mac = mac[0..-2]
+        end
+
+        # Normalize the MAC address to uppercase with hyphens (Windows format)
+        normalized_mac = mac.split(':').map { |segment| segment.rjust(2, '0') }.join('-').upcase
+
+        # rubocop:disable Style/RedundantStringEscape
+        getmac_cmd = %(bash -c "getmac /v /FO csv /NH | grep \\\"#{normalized_mac}\\\" | awk -F, '{print $1}' | sed 's/\\\"/VZWI/g'")
+        # rubocop:enable Style/RedundantStringEscape
+        raw_output = zlogin(uii, getmac_cmd)
+        adapter_name = nil
+
+        # First sanitize the raw output to remove all ANSI escape sequences
+        raw_output_str = raw_output.is_a?(Array) ? raw_output.join : raw_output.to_s
+        sanitized_output = Strings::ANSI.sanitize(raw_output_str)
+
+        # Find VZWI markers in the sanitized output
+        sanitized_output.split(/[\r\n]+/).each do |line|
+          next unless line.include?('VZWI')
+
+          # Find all positions of "VZWI" in the string
+          positions = []
+          pos = -1
+          while (pos = line.index('VZWI', pos + 1))
+            positions << pos
+          end
+
+          # If we have at least 2 occurrences, extract between the last pair
+          if positions.length >= 2
+            # Get the last two VZWI positions
+            last_pair_start = positions[-2]
+            last_pair_end = positions[-1]
+
+            # Extract between these positions (adding 4 to skip "VZWI")
+            adapter_name = line[(last_pair_start + 4)...last_pair_end]
+          end
+          break
+        end
+
+        # Only proceed if we got a valid adapter name
+        if adapter_name && !adapter_name.empty?
+          # Rename the adapter to the VNIC name
+          rename_adapter = %(netsh interface set interface name="#{adapter_name}" newname="#{vnic_name}")
+          uii.info(I18n.t('vagrant_zones.win_applied_rename_adapter')) if zlogin(uii, rename_adapter)
+
+          # Configure the interface with IP, mask, and gateway
+          cmd = %(netsh interface ipv4 set address name="#{vnic_name}" static #{ip} #{opts[:netmask]} #{defrouter})
+          uii.info(I18n.t('vagrant_zones.win_applied_static')) if zlogin(uii, cmd)
+
+          # Configure DNS if provided
+          unless opts[:dns].nil?
+            ip_addresses = dnsservers(uii, opts).map { |hash| hash['nameserver'] }
+            dns1 = %(netsh int ipv4 set dns name="#{vnic_name}" static #{ip_addresses[0]} primary validate=no)
+            uii.info(I18n.t('vagrant_zones.win_applied_dns1')) if zlogin(uii, dns1)
+            ip_addresses[1..].each_with_index do |dns, index|
+              additional_nameservers = %(netsh int ipv4 add dns name="#{vnic_name}" #{dns} index="#{index + 2}" validate=no)
+              uii.info(I18n.t('vagrant_zones.win_applied_dns2')) if zlogin(uii, additional_nameservers)
+            end
+          end
+        else
+          uii.info('Could not extract adapter name from output')
         end
       end
 

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.99'
+    VERSION = '0.1.101'
     NAME = 'vagrant-zones'
   end
 end

data/vagrant-zones.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency  'log4r', '~> 1.1'
   spec.add_dependency  'netaddr', '~> 2.0', '>= 2.0.4'
   spec.add_dependency  'ruby_expect', '~> 1.7', '>= 1.7.5'
+  spec.add_dependency  'strings-ansi', '~> 0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.99
+  version: 0.1.101
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-04 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -92,6 +92,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.5
+- !ruby/object:Gem::Dependency
+  name: strings-ansi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Vagrant provider plugin to support zones
 email:
 - support@prominic.net