vagrant-zones 0.1.99 → 0.1.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2597df7f5e76aadf6d3415e4dafe33af5029f0e2c8975e23dbe599d64d0c0755
-  data.tar.gz: 362b02ad488fb43f98d0ca954a3d934fbb247ba684d49ab8aec23f97b09eb60f
+  metadata.gz: 4f3b4be02798563d9d0f4fce9a66a07ac6cd1ea7ef09edfdeb4f9fe232a67341
+  data.tar.gz: 9ed384b15f7ee5d4f81552116580fb94c72aa9dcff84f644d8d74e9fa4db7d66
 SHA512:
-  metadata.gz: 1c570fc6fc3aa56962c3b6da0ce3d4a95dd78cb5d41dbf27af426a331842e4d6084da3a7dc62a7b897911050fc2a88d4fcbfa6ea0305df408669b1f531b86117
-  data.tar.gz: 0a5f59044ce1e5524fe044858de4757932a05f84341dca3c8eaafcff4e9ab12ce1187c871639d6eba79bfa68577f86ef362affe1c72c138eae42d55926534d68
+  metadata.gz: 4bf472087023060df2fe90c19a12410cf7e73b805dc78e3f1de4addf173466b50306257dfacabfb436d016b359b65f39a37a490fd7eaf77a0a3d26ed18e38643
+  data.tar.gz: faea40fce30d5dfc5be5915ec4c68c11d8df94afcc846707fbcad16818e0396b1209e4dc9fbb473ac147be574b4faded2fb5a63f90e23f1325c3177e69ab192a

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [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,88 @@ 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
+
+        # Debug output
+        uii.info("Looking for adapter with MAC: #{normalized_mac}")
+
+        # Use the bash command with sed to wrap adapter name with VZWI markers
+        ## DO NOT EVER ADJUST THIS COMMAND, WE MUST USE THIS EXACT COMMAND TO GET THE DATA FROM THE MACHINE
+        ## DO NOT ADJUST THE COMMAND, IT IS IMPORTANT THAT WE DO NOT EVER ADJUST THIS COMMAND
+        ## DO NOT ADJUST THE COMMAND
+        ## DO NOT ADJUST THE COMMAND!!!!!!!!!! SERIOUSLY
+        getmac_cmd = %(bash -c "getmac /v /FO csv /NH | grep "#{normalized_mac}" | awk -F, '{print $1}' | sed 's/"/VZWI/g'")
+        raw_output = zlogin(uii, getmac_cmd)
+
+        uii.info("Raw adapter result: #{raw_output.inspect}")
+
+        if raw_output.is_a?(String)
+          hex_display = raw_output.bytes.map { |b| format('\\x%02X', b) }.join
+          uii.info("Hex representation: #{hex_display}")
+        elsif raw_output.is_a?(Array)
+          # Handle array case
+          hex_display = raw_output.join.bytes.map { |b| format('\\x%02X', b) }.join
+          uii.info("Hex representation (array joined): #{hex_display}")
+        end
+
+        # Use the strings-ansi gem to sanitize the raw output
+        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)
+
+        # Debug the sanitized output
+        uii.info("Sanitized output: #{sanitized_output.inspect}")
+
+        # Find VZWI markers in the sanitized output
+        sanitized_output.split(/[\r\n]+/).each do |line|
+          next unless line.include?('VZWI')
+
+          uii.info("Found line with VZWI markers (sanitized): #{line}")
+
+          # Extract the adapter name between VZWI markers using direct match
+          if line =~ /VZWI(.+?)VZWI/
+            adapter_name = ::Regexp.last_match(1)
+            uii.info("Extracted adapter name from sanitized output: '#{adapter_name}'")
+          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
+          uii.info("Using extracted adapter name '#{adapter_name}' for rename")
+          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.100'
     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.100
 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