vagrant-libvirt 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e424c510119507bbfc057c3f53ddef7151863d0680be4957c104cacd514ce737
-  data.tar.gz: 9453b83d2078e8787535da2dc6c558bfa44a44b4ce87e2218485e11d8eea0f70
+  metadata.gz: b5b3a11dacc2b43a80c7419af116d73d2a7e636c325296f22681f23a0d033a20
+  data.tar.gz: 408df37e3ec6a923f884f15a73778d33408ac59169f8152822b0634e384a09a8
 SHA512:
-  metadata.gz: 3abe6c5883f9c6b2b38890d7a2dfe1f87fc2f9290aad30e4742e62d9ba736ed6aacbb394b161e44621ab354087ba5b395d119bb31b006baf6166152553ea8d43
-  data.tar.gz: 69ce100c38dc5b7968da4bf2f0369e3eaa1b61763aa7d1fcd03cad117e060bc45df35560691c9928aebe42851414b6ba6ee73441943061e9a871461d70a21dcd
+  metadata.gz: b890ae1fa0eb2f5ef7b212be83acc94eff485f673e3b1bdd40a1f16afbc035af0996a8e31db76148866cc51f5c9c9bf09cc61549e7c3767ba647a4db55265410
+  data.tar.gz: 211e8ce3e5cf1088e9137fc6ec26829e1fede30b1b714388c48369ddd6d9b7cc4b2aa147776f14f5faa120df0a7a1e9d3bbee13e8f58492b4d17fd3a64afd343

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'diffy'
 require 'log4r'
+
+require 'equivalent-xml'
 require 'rexml/document'
 
 module VagrantPlugins
@@ -425,24 +426,29 @@ module VagrantPlugins
                 end
 
                 begin
-                  proposed = Nokogiri::XML(new_xml, &:noblanks)
+                  # need to check whether the updated XML contains all the changes requested
 
-                  # This normalizes the attribute order to be consistent across both XML docs to eliminate differences
-                  # for subsequent comparison by diffy
-                  updated_xml_descr = REXML::Document.new(libvirt_domain.xml_desc(1))
-                  updated_xml = String.new
-                  updated_xml_descr.write(updated_xml)
+                  # This normalizes the attribute order to be consistent across both XML docs to
+                  # eliminate differences for subsequent comparison by diffy
+                  applied_xml_descr = REXML::Document.new(libvirt_domain.xml_desc(1))
+                  applied_xml = String.new
+                  applied_xml_descr.write(applied_xml)
+
+                  proposed = Nokogiri::XML(new_xml, &:noblanks)
+                  applied = Nokogiri::XML(applied_xml, &:noblanks)
 
-                  updated = Nokogiri::XML(updated_xml, &:noblanks)
+                  if !EquivalentXml.equivalent?(proposed, applied)
+                    require 'diffy'
 
-                  pretty_proposed = StringIO.new
-                  pretty_updated = StringIO.new
-                  proposed.write_xml_to(pretty_proposed, indent: 2)
-                  updated.write_xml_to(pretty_updated, indent: 2)
+                    # pretty print the XML as even though there can be additional changes,
+                    # the output with diffy appears to be clearer
+                    pretty_proposed = StringIO.new
+                    pretty_applied = StringIO.new
+                    proposed.write_xml_to(pretty_proposed, indent: 2)
+                    applied.write_xml_to(pretty_applied, indent: 2)
 
-                  diff = Diffy::Diff.new(pretty_proposed.string, pretty_updated.string, :context => 3).to_s(:text)
+                    diff = Diffy::Diff.new(pretty_proposed.string, pretty_applied.string, :context => 3).to_s(:text)
 
-                  unless diff.empty?
                     error_msg = "Libvirt failed to fully update the domain with the specified XML. Result differs from requested:\n" +
                       "--- requested\n+++ result\n#{diff}\n" +
                       "Typically this means there is a bug in the XML being sent, please log an issue"

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.10.3
+0.10.4

data/spec/unit/action/start_domain_spec/default_with_different_formatting.xml

@@ -0,0 +1,37 @@
+<domain xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0' type=''>
+  <name/>
+  <title/>
+  <description/>
+  <uuid/>
+  <memory/>
+  <vcpu>1</vcpu>
+  <cpu check="none" mode="host-model">
+
+
+  </cpu>
+  <os>
+    <type>hvm</type>
+    <kernel/>
+    <initrd/>
+    <cmdline/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'/>
+  <devices>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <console type='pty'>
+      <target port='0'/>
+    </console>
+    <input bus='ps2' type='mouse'/>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <video>
+      <model heads='1' type='cirrus' vram='16384'/>
+    </video>
+  </devices>
+</domain>

data/spec/unit/action/start_domain_spec.rb

@@ -50,6 +50,31 @@ describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
       expect(subject.call(env)).to be_nil
     end
 
+    context 'when xml is formatted differently' do
+      let(:test_file) { 'default_with_different_formatting.xml' }
+      let(:updated_domain_xml) {
+        new_xml = domain_xml.dup
+        new_xml.gsub!(/<cpu .*<\/cpu>/m, '<cpu check="none" mode="host-passthrough"/>')
+        new_xml
+      }
+      let(:vagrantfile_providerconfig) do
+        <<-EOF
+        libvirt.cpu_mode = "host-passthrough"
+        EOF
+      end
+
+      it 'should correctly detect the domain was updated' do
+        expect(ui).to_not receive(:error)
+        expect(libvirt_domain).to receive(:autostart=)
+        expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+        expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml, updated_domain_xml)
+        expect(domain).to receive(:start)
+
+        expect(subject.call(env)).to be_nil
+      end
+
+    end
+
     context 'when any setting changed' do
       let(:vagrantfile_providerconfig) do
         <<-EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Lukas Stanek
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
@@ -55,6 +55,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +304,7 @@ files:
 - spec/unit/action/start_domain_spec/default.xml
 - spec/unit/action/start_domain_spec/default_added_tpm_path.xml
 - spec/unit/action/start_domain_spec/default_added_tpm_version.xml
+- spec/unit/action/start_domain_spec/default_with_different_formatting.xml
 - spec/unit/action/start_domain_spec/existing.xml
 - spec/unit/action/start_domain_spec/existing_added_nvram.xml
 - spec/unit/action/start_domain_spec/nvram_domain.xml
@@ -417,6 +432,7 @@ test_files:
 - spec/unit/action/start_domain_spec/existing_added_nvram.xml
 - spec/unit/action/start_domain_spec/clock_timer_rtc.xml
 - spec/unit/action/start_domain_spec/existing.xml
+- spec/unit/action/start_domain_spec/default_with_different_formatting.xml
 - spec/unit/action/destroy_domain_spec/additional_disks_domain.xml
 - spec/unit/action/destroy_domain_spec/box_multiple_disks.xml
 - spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks_no_aliases.xml