From ae4f7ec596f190afeff185bf474a7ba4f66a160e Mon Sep 17 00:00:00 2001
From: Mark Gilbert <50398495+MarkProminic@users.noreply.github.com>
Date: Mon, 27 Nov 2023 02:48:29 -0600
Subject: [PATCH] fix: on demand vnics vlans

---
 lib/vagrant-zones/driver.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant-zones/driver.rb b/lib/vagrant-zones/driver.rb
index 12ed497..7810a80 100644
--- a/lib/vagrant-zones/driver.rb
+++ b/lib/vagrant-zones/driver.rb
@@ -1063,13 +1063,13 @@ def zonecfgnicconfig(uii, opts)
           execute(false, %(#{strt}set global-nic=auto; #{shrtstr1} #{shrtstr2}"))
         when 'bhyve'
           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 && 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
             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