vagrant-zones 0.1.98 → 0.1.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d8030de6b60c644966b08811778904fc0aa9d560daffa5fd94e203c9cf4963d
-  data.tar.gz: e51be9e241435f2ba7d545e66b68caad81da09f807b31770e4ce40155ae98e3f
+  metadata.gz: 4f3b4be02798563d9d0f4fce9a66a07ac6cd1ea7ef09edfdeb4f9fe232a67341
+  data.tar.gz: 9ed384b15f7ee5d4f81552116580fb94c72aa9dcff84f644d8d74e9fa4db7d66
 SHA512:
-  metadata.gz: a69de6c69df04f0a5797e00fe72cef4c428750a8111d93a0e95667a151a7e32d93a12b05b2fecf8a1a42ffa5fa8ae96c130d876a86a80ba2920e7564ccda52bf
-  data.tar.gz: 3fe3fbcaee6edee3a4cc1eb2be647bcd98e95cba1b5b5a1b632750855a331a58cca2524bdfa9b30ae3ec8c32043067e81951ee0cb9edf0f2e7f7bcf9c99b77be
+  metadata.gz: 4bf472087023060df2fe90c19a12410cf7e73b805dc78e3f1de4addf173466b50306257dfacabfb436d016b359b65f39a37a490fd7eaf77a0a3d26ed18e38643
+  data.tar.gz: faea40fce30d5dfc5be5915ec4c68c11d8df94afcc846707fbcad16818e0396b1209e4dc9fbb473ac147be574b4faded2fb5a63f90e23f1325c3177e69ab192a

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # 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)
+
+
+### Bug Fixes
+
+* null vlans ([ef22b48](https://github.com/STARTcloud/vagrant-zones/commit/ef22b481a3e8293039b371dd49db00f87c71923f))
+* rubocop linting errors ([48530c4](https://github.com/STARTcloud/vagrant-zones/commit/48530c41be5e46123d8773abdf651ff5ca0c879b))
+* rubocop linting errors ([018b555](https://github.com/STARTcloud/vagrant-zones/commit/018b5551eaf64de5e404e6abee32f9257c214f07))
+
 ## [0.1.98](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.97...v0.1.98) (2024-10-11)
 
 

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/action/import.rb

@@ -66,7 +66,7 @@ module VagrantPlugins
                       ratelimit += 1
                       if ratelimit >= rate
                         uiprogress.clear_line
-                        status = format('%.2f%%', (amount_downloaded.to_f / file_size * 100))
+                        status = format('%.2f%%', amount_downloaded.to_f / file_size * 100)
                         uiprogress.info(I18n.t('vagrant_zones.importing_joyent_image') + "#{image} ==> ", new_line: false)
                         uiprogress.report_progress(status, 100, false)
                         ratelimit = 0

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
@@ -727,7 +728,7 @@ module VagrantPlugins
         uii.info(I18n.t('vagrant_zones.creating_vnic'))
         uii.info("  #{vnic_name}")
         command = "#{@pfexec} dladm create-vnic -l #{opts[:bridge]} -m #{mac}"
-        command += " -v #{opts[:vlan]}" unless opts[:vlan].nil? || (opts[:vlan]).zero?
+        command += " -v #{opts[:vlan]}" unless opts[:vlan].nil? || opts[:vlan].zero?
         command += " #{vnic_name}"
         execute(false, command)
       end
@@ -928,9 +929,9 @@ module VagrantPlugins
       ## zonecfg function for CPU Configurations
       def zonecfgcpu(uii, _name, config, zcfg)
         uii.info(I18n.t('vagrant_zones.zonecfgcpu')) if config.debug
-        if config.cpu_configuration == 'simple' && (config.brand == 'bhyve' || config.brand == 'kvm')
+        if config.cpu_configuration == 'simple' && %w[bhyve kvm].include?(config.brand)
           execute(false, %(#{zcfg}"add attr; set name=vcpus; set value=#{config.cpus}; set type=string; end;"))
-        elsif config.cpu_configuration == 'complex' && (config.brand == 'bhyve' || config.brand == 'kvm')
+        elsif config.cpu_configuration == 'complex' && %w[bhyve kvm].include?(config.brand)
           hash = config.complex_cpu_conf[0]
           cstring = %(sockets=#{hash['sockets']},cores=#{hash['cores']},threads=#{hash['threads']})
           execute(false, %(#{zcfg}'add attr; set name=vcpus; set value="#{cstring}"; set type=string; end;'))
@@ -1054,15 +1055,15 @@ module VagrantPlugins
           shrtstr2 = %(add property (name=ips,value="#{allowed_address}"); add property (name=primary,value="true"); end;)
           execute(false, %(#{zonecfg_cmd}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
         when 'bhyve'
-          vlan_option = opts[:vlan].nil? || opts[:vlan].zero? ? '' : "set vlan-id=#{opts[:vlan]}; "
+          vlan_option = opts[:vlan].nil? || opts[:vlan].zero? ? '' : "set vlan-id=#{opts[:vlan]};"
           base_cmd = if config.on_demand_vnics
-                       %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; #{vlan_option}set global-nic=#{opts[:bridge]}; )
+                       %(add net; set physical=#{vnic_name}; #{vlan_option} set global-nic=#{opts[:bridge]};)
                      else
-                       %(#{zonecfg_cmd}"add net; set physical=#{vnic_name}; )
+                       %(add net; set physical=#{vnic_name};)
                      end
-          execute(false, %(#{base_cmd}end;)) unless cie
-          execute(false, %(#{base_cmd}set allowed-address=#{allowed_address}; end;)) if cie && aa
-          execute(false, %(#{base_cmd}end;)) if cie && !aa
+          execute(false, %(#{zonecfg_cmd} "#{base_cmd} end;")) unless cie
+          execute(false, %(#{zonecfg_cmd} "#{base_cmd} set allowed-address=#{allowed_address}; end;")) if cie && aa
+          execute(false, %(#{zonecfg_cmd} "#{base_cmd} end;")) if cie && !aa
         end
       end
 
@@ -1129,7 +1130,7 @@ module VagrantPlugins
 
       ## This setups the Netplan based OS Networking via Zlogin
       def zoneniczloginsetup_netplan(uii, opts, mac)
-        zlogin(uii, 'rm -rf /etc/netplan/*.yaml') if (opts[:nic_number]).zero?
+        zlogin(uii, 'rm -rf /etc/netplan/*.yaml') if opts[:nic_number].zero?
         ip = ipaddress(uii, opts)
         vnic_name = vname(uii, opts)
         servers = dnsservers(uii, opts).map { |server| server['nameserver'] }.join(', ') unless opts[:dns].nil?
@@ -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
 
@@ -1644,7 +1713,7 @@ module VagrantPlugins
         uii.info(I18n.t('vagrant_zones.cron_entries'))
         h = { h: 'hourly', d: 'daily', w: 'weekly', m: 'monthly' }
         h.each do |(_k, d)|
-          next unless opts[:list] == d || opts[:list] == 'all'
+          next unless [d, 'all'].include?(opts[:list])
 
           uii.info(cronjobs[d.to_sym]) unless cronjobs[d.to_sym].nil?
         end
@@ -1659,7 +1728,7 @@ module VagrantPlugins
         h = { h: 'hourly', d: 'daily', w: 'weekly', m: 'monthly' }
         uii.info(I18n.t('vagrant_zones.cron_delete'))
         h.each do |(_k, d)|
-          next unless opts[:delete] == d || opts[:delete] == 'all'
+          next unless [d, 'all'].include?(opts[:delete])
 
           cj = cronjobs[d.to_sym].to_s.gsub('*', '\*')
           rc = "#{rmcr}'#{cj}' | #{sc}"

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.98'
+    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.98
+  version: 0.1.100
 platform: ruby
 authors:
 - Mark Gilbert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-11 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
@@ -176,7 +190,7 @@ metadata:
   documentation_uri: http://rubydoc.info/gems/vagrant-zones
   source_code_uri: https://github.com/STARTCloud/vagrant-zones
   github_repo: https://github.com/STARTCloud/vagrant-zones
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubygems_version: 3.2.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Vagrant provider plugin to support zones
 test_files: []