vagrant-zones 0.1.73 → 0.1.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1db5834991b56f5766c88f90ff5f227e3dd26bd77d48df861b9983807bf24432
-  data.tar.gz: 58146a70bed428cd95df64bc3df9bf4766d1090a4003aea6e22fbcfa4255f1a4
+  metadata.gz: 1dab425b6690300af387e357ac70a9582012231cd24a0e42e0b2c1efc063bb83
+  data.tar.gz: bb354c70334e6a60edb4f0db444380b189cc14378ba5d0de4e02d69117f2f71a
 SHA512:
-  metadata.gz: 37f9361e1db8bb106ff23499263f98e182a6b8d2470956000e66e2db77ecca7bdf6f066f4da72a5ee1c27fab41dd84aac61e18ff1b337dcbad1fcd0702ff18e9
-  data.tar.gz: 430adac41fa0b0ae65a98d8d3156b4da11b552b19d3130bc6246a6f4492314c18fa792ad963fbc88573bb057b2c2616538db7bff50cfd60a60d1575072ab2f61
+  metadata.gz: 1802d96944997330e489f88800b6b156b7850acb6eb9e40febbec600e3eafa0fcb0a5f4875443b9818dee6b4dd700df7d7fc8e583d08f1515eeb3c6c0ec3716d
+  data.tar.gz: e4a2a9f1cd7d5b8799edacce7bfec549caeaf052ec2e6066a378f8168cc05e2eaea9c24d2c40b166360c6a770d5ceaeef6ca8426c1729347be0b1e7b7ad6cf9d

data/.rubocop.yml

@@ -43,7 +43,7 @@ Style/LineEndConcatenation:
 Layout/LineLength:
   Description: 'Limit lines to 139 characters.'
   Enabled: true
-  Max: 139
+  Max: 200
 
 Metrics/CyclomaticComplexity:
   Description: 'Avoid complex methods.'

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [0.1.76](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.75...v0.1.76) (2023-11-27)
+
+
+### Bug Fixes
+
+* forgot to add to config.rb ([5a98934](https://github.com/STARTcloud/vagrant-zones/commit/5a98934851f78e3ec9f1a1c0580aeb3d50cab66b))
+
+## [0.1.75](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.74...v0.1.75) (2023-11-27)
+
+
+### Bug Fixes
+
+* increase rubocop linelength limit ([653a94f](https://github.com/STARTcloud/vagrant-zones/commit/653a94fd85efe5e2f850fdf7a76e0867be87f96b))
+
+## [0.1.74](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.73...v0.1.74) (2023-11-27)
+
+
+### Bug Fixes
+
+* on-deman vnics ([80c8a42](https://github.com/STARTcloud/vagrant-zones/commit/80c8a429ed9a8e3ad624b3f52fc8b4873803a417))
+* rubocop lint adjustments ([fb22b4f](https://github.com/STARTcloud/vagrant-zones/commit/fb22b4f7fb80b3eb76aa351e67b18f3b4271cf43))
+* ruby lint syntax, doesn't like not ([eebf699](https://github.com/STARTcloud/vagrant-zones/commit/eebf6992cbae1e372cf3d859c0ee039691a0be92))
+
 ## [0.1.73](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.72...v0.1.73) (2023-08-19)
 
 

data/lib/vagrant-zones/config.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
     # This is used define the variables for the project
     class Config < Vagrant.plugin('2', :config)
       # rubocop:disable Layout/LineLength
-      attr_accessor :brand, :autoboot, :setup_method, :safe_restart, :allowed_address, :safe_shutdown, :boxshortname, :kernel, :debug, :debug_boot, :private_network, :winalcheck, :winlcheck, :lcheck, :alcheck, :snapshot_script, :diskif, :netif, :cdroms, :disk1path, :disk1size, :cpus, :cpu_configuration, :boot, :complex_cpu_conf, :memory, :vagrant_user, :vagrant_user_private_key_path, :setup_wait, :clean_shutdown_time, :dhcp4, :vagrant_user_pass, :firmware_type, :vm_type, :partition_id, :shared_disk_enabled, :shared_dir, :acpi, :os_type, :console, :consolehost, :consoleport, :console_onboot, :hostbridge, :sshport, :rdpport, :override, :additional_disks, :cloud_init_resolvers, :cloud_init_enabled, :cloud_init_dnsdomain, :cloud_init_password, :cloud_init_sshkey, :cloud_init_conf, :dns, :box, :vagrant_cloud_creator, :winbooted_string, :booted_string, :zunlockbootkey, :zunlockboot, :xhci_enabled, :login_wait
+      attr_accessor :brand, :autoboot, :setup_method, :safe_restart, :allowed_address, :safe_shutdown, :boxshortname, :kernel, :debug, :debug_boot, :private_network, :winalcheck, :winlcheck, :lcheck, :alcheck, :snapshot_script, :diskif, :netif, :cdroms, :disk1path, :disk1size, :cpus, :cpu_configuration, :boot, :complex_cpu_conf, :memory, :vagrant_user, :vagrant_user_private_key_path, :setup_wait, :on_demand_vnics, :clean_shutdown_time, :dhcp4, :vagrant_user_pass, :firmware_type, :vm_type, :partition_id, :shared_disk_enabled, :shared_dir, :acpi, :os_type, :console, :consolehost, :consoleport, :console_onboot, :hostbridge, :sshport, :rdpport, :override, :additional_disks, :cloud_init_resolvers, :cloud_init_enabled, :cloud_init_dnsdomain, :cloud_init_password, :cloud_init_sshkey, :cloud_init_conf, :dns, :box, :vagrant_cloud_creator, :winbooted_string, :booted_string, :zunlockbootkey, :zunlockboot, :xhci_enabled, :login_wait
 
       # rubocop:enable Layout/LineLength
 
@@ -49,6 +49,7 @@ module VagrantPlugins
         @hostbridge = 'i440fx'
         @acpi = 'on'
         @setup_wait = 90
+        @on_demand_vnics = 'true'
         @box = UNSET_VALUE
         @clean_shutdown_time = 300
         @vmtype = 'production'

data/lib/vagrant-zones/driver.rb

@@ -322,7 +322,7 @@ module VagrantPlugins
           when 'public_network'
             zonenicdel(uii, opts) if state == 'delete'
             zonecfgnicconfig(uii, opts) if state == 'config'
-            zoneniccreate(uii, opts) if state == 'create'
+            zoneniccreate(uii, opts) if state == 'create' && !config.on_demand_vnics
             zonenicstpzloginsetup(uii, opts, config) if state == 'setup' && config.setup_method == 'zlogin'
           when 'private_network'
             zonenicdel(uii, opts) if state == 'delete'
@@ -332,7 +332,7 @@ module VagrantPlugins
             etherstubdelete(uii, opts) if state == 'delete'
             natnicconfig(uii, opts) if state == 'config'
             etherstub = etherstubcreate(uii, opts) if state == 'create'
-            zonenatniccreate(uii, opts, etherstub) if state == 'create'
+            zonenatniccreate(uii, opts, etherstub) if state == 'create' && !config.on_demand_vnics
             etherstubcreatehvnic(uii, opts, etherstub) if state == 'create'
             zonenatforward(uii, opts) if state == 'create'
             zonenatentries(uii, opts) if state == 'create'
@@ -1062,9 +1062,19 @@ module VagrantPlugins
           shrtstr2 = %(add property (name=ips,value="#{allowed_address}"); add property (name=primary,value="true"); end;)
           execute(false, %(#{strt}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
         when 'bhyve'
-          execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) unless cie
-          execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set allowed-address=#{allowed_address}; end;")) if cie && aa
-          execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) if cie && !aa
+          if config.on_demand_vnics && opts[:vlan].nil?
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; end;")) unless cie
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; set allowed-address=#{allowed_address}; end;")) if cie && aa
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set global-nic=#{opts[:bridge]}; end;")) if cie && !aa
+          elsif config.on_demand_vnics && !opts[:vlan].nil?
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; end;")) unless cie
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; set allowed-address=#{allowed_address}; end;")) if cie && aa
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set vlan-id=#{opts[:vlan]}; set global-nic=#{opts[:bridge]}; end;")) if cie && !aa
+          elsif !config.on_demand_vnics
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) unless cie
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; set allowed-address=#{allowed_address}; end;")) if cie && aa
+            execute(false, %(#{strt}"add net; set physical=#{vnic_name}; end;")) if cie && !aa
+          end
         end
       end
 

data/lib/vagrant-zones/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.73
+  version: 0.1.76
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-19 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n