vagrant-libvirt 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def1435c7bf9fcebb8ca2b0c038317b14b3ab02c42582257a27e97b84dbb57bb
-  data.tar.gz: abf0b94e5bd4d6c279fab842844c0d86b97b34382f898f0564a7251453f369c0
+  metadata.gz: 40dbf1a78ed383e5c289059d869c281c778fee7414a0a1711849d9dcba16df52
+  data.tar.gz: 2bf17eb2166d56a0386d6bbd70d6548d89def585aaf6f10c929f8afc546496bc
 SHA512:
-  metadata.gz: bbff78a2c9409e800da340ad264aa846cfe31934e36296c46ccf9e352849343f80c042038e35eb65a2643bdbc6330c9f1f3e21060847d3121ccb21ab5fe71c00
-  data.tar.gz: b605b592f7c0d4fe024c63b0f2a9d2618cb54a72550f2c9f6489f92a8ba09f083153bb3c522309b8363969775b38815b2bd9a55dd8ff8251e9a04577cb126ec2
+  metadata.gz: e9fa89d429ae04d5375930e3bfec06d3cf2c152803e8dc6a3fcb9c4a8ac4e81e1bafe08639fe689e9535cf3889bb1fd548c196ebe064abbad1edbfd85619ce0f
+  data.tar.gz: 4713ea077cc23984256c1a0ed55a67ec44c0a687f3a7c72916762a65807995c4fd5e1206f0ed86cc69008f8bf51a7cfff07b36f6947cd90bd29e136c2649c9f7

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

@@ -146,7 +146,7 @@ module VagrantPlugins
               # FIXME: all options for network driver should be hash from Vagrantfile
               driver_options = {}
               driver_options[:name] = @driver_name if @driver_name
-              driver_options[:iommu] = @driver_iommu ? "on" : "off"
+              driver_options[:iommu] = @driver_iommu ? "on" : "off" if @nic_model_type == 'virtio'
               driver_options[:queues] = @driver_queues if @driver_queues
 
               @udp_tunnel ||= {}
@@ -271,10 +271,9 @@ module VagrantPlugins
 
               xml.mac(address: mac) if mac
               xml.target(dev: target_dev_name(device_name, type, iface_number))
-              xml.alias(name: "net#{iface_number}")
               xml.model(type: model_type.to_s)
               xml.mtu(size: Integer(mtu)) if mtu
-              xml.driver(**driver_options)
+              xml.driver(**driver_options) if driver_options
               xml.address(type: 'pci', bus: pci_bus, slot: pci_slot) if pci_bus and pci_slot
             end
           end.to_xml(

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

@@ -20,7 +20,7 @@ module VagrantPlugins
             if libvirt_domain.has_managed_save?
               env[:result] = env[:machine].state.id == :shutoff
             else
-              env[:result] = env[:machine].state.id == :paused
+              env[:result] = [:paused, :pmsuspended].include?(env[:machine].state.id)
               if env[:result]
                 env[:ui].warn('One time switching to pause suspend mode, found a paused VM.')
                 config.suspend_mode = 'pause'
@@ -32,7 +32,7 @@ module VagrantPlugins
               env[:result] = [:shutoff, :paused].include?(env[:machine].state.id)
               config.suspend_mode = 'managedsave'
             else
-              env[:result] = env[:machine].state.id == :paused
+              env[:result] = [:paused, :pmsuspended].include?(env[:machine].state.id)
             end
           end
 

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

@@ -20,7 +20,9 @@ module VagrantPlugins
 
           libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(env[:machine].id)
           config = env[:machine].provider_config
-          if config.suspend_mode == 'managedsave'
+          if env[:machine].state.id == :pmsuspended
+            libvirt_domain.pmwakeup
+          elsif config.suspend_mode == 'managedsave'
             domain.start
           else
             domain.resume

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.11.1
+0.11.2

data/locales/en.yml

@@ -205,6 +205,8 @@ en:
     states:
       paused: |-
         The Libvirt domain is suspended. Run `vagrant resume` to resume it.
+      pmsuspended: |-
+        The Libvirt domain is suspended. Run `vagrant resume` to resume it.
       shutting_down: |-
         The Libvirt domain is shutting down. Wait for it to complete and
         then run `vagrant up` to start it or `vagrant destroy` to remove.

data/spec/unit/action/resume_domain_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative '../../spec_helper'
+
+require 'vagrant-libvirt/action/resume_domain'
+
+
+describe VagrantPlugins::ProviderLibvirt::Action::ResumeDomain do
+  subject { described_class.new(app, env) }
+
+  include_context 'unit'
+  include_context 'libvirt'
+
+  let(:driver) { instance_double(::VagrantPlugins::ProviderLibvirt::Driver) }
+  let(:libvirt_domain) { instance_double(::Libvirt::Domain) }
+  let(:libvirt_client) { instance_double(::Libvirt::Connect) }
+  let(:servers) { double('servers') }
+  let(:state) { instance_double(::Vagrant::MachineState) }
+
+  before do
+    allow(machine.provider).to receive('driver').and_return(driver)
+    allow(driver).to receive(:connection).and_return(connection)
+  end
+
+  describe '#call' do
+    before do
+      allow(connection).to receive(:servers).and_return(servers)
+      allow(servers).to receive(:get).and_return(domain)
+      allow(connection).to receive(:client).and_return(libvirt_client)
+      allow(libvirt_client).to receive(:lookup_domain_by_uuid).and_return(libvirt_domain)
+
+      allow(machine).to receive(:state).and_return(state)
+
+      expect(ui).to receive(:info).with(/Resuming domain/)
+    end
+
+    it 'should resume by default' do
+      expect(state).to receive(:id).and_return(:paused)
+      expect(domain).to receive(:resume)
+      expect(logger).to receive(:info).with('Machine dummy-vagrant_dummy is resumed.')
+
+      expect(subject.call(env)).to be_nil
+    end
+
+    context 'when in pmsuspend' do
+      it 'should wakeup the domain' do
+        expect(state).to receive(:id).and_return(:pmsuspended)
+        expect(libvirt_domain).to receive(:pmwakeup)
+        expect(logger).to receive(:info).with('Machine dummy-vagrant_dummy is resumed.')
+
+        expect(subject.call(env)).to be_nil
+      end
+    end
+
+    context 'when suspend_mode is managedsave' do
+      it 'should start the domain' do
+        machine.provider_config.suspend_mode = 'managedsave'
+        expect(state).to receive(:id).and_return(:paused)
+        expect(domain).to receive(:start)
+        expect(logger).to receive(:info).with('Machine dummy-vagrant_dummy is resumed.')
+
+        expect(subject.call(env)).to be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Lukas Stanek
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2022-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
@@ -297,6 +297,7 @@ files:
 - spec/unit/action/resolve_disk_settings_spec/multi_volume_box.xml
 - spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_and_custom_no_aliases.xml
 - spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_storage.xml
+- spec/unit/action/resume_domain_spec.rb
 - spec/unit/action/set_boot_order_spec.rb
 - spec/unit/action/set_boot_order_spec/default.xml
 - spec/unit/action/set_boot_order_spec/explicit_boot_order.xml
@@ -422,6 +423,7 @@ test_files:
 - spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_and_custom_no_aliases.xml
 - spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_storage.xml
 - spec/unit/action/resolve_disk_settings_spec.rb
+- spec/unit/action/resume_domain_spec.rb
 - spec/unit/action/set_boot_order_spec/default.xml
 - spec/unit/action/set_boot_order_spec/explicit_boot_order.xml
 - spec/unit/action/set_boot_order_spec.rb