vagrant-libvirt 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c040a1d251767da60c78665550646f187542bbf7b9997cc79fad57912496026
-  data.tar.gz: da241c3927605330f056e1b235910f35c9387b130fe645ba42418b388b34f08d
+  metadata.gz: 8ea176b68227366ddb6ac763a2e66c55cffaa58e9d4cc188f3f8b6c62bb3cd06
+  data.tar.gz: a8cfb80de7f57fbcd2e4bec2fdf7f7043a81f410da00606a5f88897374535baf
 SHA512:
-  metadata.gz: '0478c2e07037e6ca618f17d4965bed901227d48cc7eed448afb099d079e807450263b7ded71cd7a26dfaa83676e25cea890623b7b678c2c5b798df10895366a8'
-  data.tar.gz: bd18eb62fd9e0cd134511cdf642697272a16ae85fa882e9bcdfb9fea157878b2fa918e71fd0c9fa418a104e846211892450ad097965f588f4590495fdec00d3f
+  metadata.gz: 9b005c6323cee5bfe5facbe14d5b3f7acddd9076b428d126acd220080b5946107795eee6726893bdfc7e9e67b08534a8c475b9f1d6c8de79f79dcf8c125564e8
+  data.tar.gz: 257c7b4bf7c7390c0013101eb6541d43e2d60d871309053201376b5cfff5439610f5aacb05775b24b37ddc374b2d8dff4deab0a8163c4821a5f34c7c5d76ed35

data/lib/vagrant-libvirt/action/create_network_interfaces.rb

@@ -81,7 +81,7 @@ module VagrantPlugins
             @driver_name = iface_configuration.fetch(:driver_name, false)
             @driver_iommu = iface_configuration.fetch(:driver_iommu, false )
             @driver_queues = iface_configuration.fetch(:driver_queues, false)
-            @device_name = iface_configuration.fetch(:iface_name, false)
+            @device_name = iface_configuration.fetch(:iface_name, nil)
             @mtu = iface_configuration.fetch(:mtu, nil)
             @pci_bus = iface_configuration.fetch(:bus, nil)
             @pci_slot = iface_configuration.fetch(:slot, nil)

data/lib/vagrant-libvirt/config.rb

@@ -70,6 +70,7 @@ module VagrantPlugins
       attr_accessor :management_network_mtu
       attr_accessor :management_network_keep
       attr_accessor :management_network_driver_iommu
+      attr_accessor :management_network_iface_name
       attr_accessor :management_network_model_type
 
       # System connection information
@@ -258,6 +259,7 @@ module VagrantPlugins
         @management_network_mtu = UNSET_VALUE
         @management_network_keep = UNSET_VALUE
         @management_network_driver_iommu = UNSET_VALUE
+        @management_network_iface_name = UNSET_VALUE
         @management_network_model_type = UNSET_VALUE
 
         # System connection information
@@ -973,6 +975,7 @@ module VagrantPlugins
         @management_network_mtu = nil if @management_network_mtu == UNSET_VALUE
         @management_network_keep = false if @management_network_keep == UNSET_VALUE
         @management_network_driver_iommu = false if @management_network_driver_iommu == UNSET_VALUE
+        @management_network_iface_name = nil if @management_network_iface_name == UNSET_VALUE
         @management_network_model_type = 'virtio' if @management_network_model_type == UNSET_VALUE
 
         # Domain specific settings.

data/lib/vagrant-libvirt/util/network_util.rb

@@ -34,6 +34,7 @@ module VagrantPlugins
           management_network_mtu = machine.provider_config.management_network_mtu
           management_network_keep = machine.provider_config.management_network_keep
           management_network_driver_iommu = machine.provider_config.management_network_driver_iommu
+          management_network_iface_name = machine.provider_config.management_network_iface_name
           management_network_model_type = machine.provider_config.management_network_model_type
           logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
@@ -79,6 +80,7 @@ module VagrantPlugins
           end
 
           management_network_options[:driver_iommu] = management_network_driver_iommu
+          management_network_options[:iface_name] = management_network_iface_name
 
           unless management_network_mac.nil?
             management_network_options[:mac] = management_network_mac

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.12.0
+0.12.1

data/spec/unit/action/create_network_interfaces.rb

@@ -92,6 +92,56 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateNetworkInterfaces do
       expect(subject.call(env)).to be_nil
     end
 
+    context 'management network' do
+      let(:domain_xml) {
+        # don't need full domain here, just enough for the network element to work
+        <<-EOF.unindent
+        <domain type='qemu'>
+          <devices>
+            <interface type='network'>
+              <alias name='ua-net-0'/>
+              <mac address='52:54:00:7d:14:0e'/>
+              <source network='vagrant-libvirt'/>
+              <target dev="myvnet0"></target>
+              <model type='virtio'/>
+              <driver iommu='off'/>
+              <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+            </interface>
+          </devices>
+        </domain>
+        EOF
+      }
+
+      before do
+        allow(libvirt_domain).to receive(:xml_desc).and_return(domain_xml)
+      end
+
+      context 'when iface name is set' do
+        let(:vagrantfile_providerconfig) {
+          <<-EOF
+          libvirt.management_network_iface_name = 'myvnet0'
+          EOF
+        }
+        let(:management_nic_xml) {
+          <<-EOF.unindent
+          <interface type="network">
+            <alias name="ua-net-0"></alias>
+            <source network="vagrant-libvirt"></source>
+            <target dev="myvnet0"></target>
+            <model type="virtio"></model>
+            <driver iommu="off"></driver>
+          </interface>
+          EOF
+        }
+
+        it 'should set target appropriately' do
+          expect(driver).to receive(:attach_device).with(management_nic_xml)
+
+          expect(subject.call(env)).to be_nil
+        end
+      end
+    end
+
     context 'private network' do
       let(:vagrantfile) do
         <<-EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Lukas Stanek
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-22 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-libvirt