Filter out UNDEFINE_NVRAM for test:///default

The test driver doesn't support UNDEFINE_NVRAM and I couldn't find a way to probe for the capability. This hacks around it by looking at the service uri and filters out the flag. It also adds an explicit test since previously the exception was swallowed. A new server is created to avoid interference with other tests. The cherry pick doesn't include tests because the testing infrastructure doesn't work in this branch. (cherry picked from commit 14ac85e)
fog · Jul 17, 2024 · 5d101c9 · 5d101c9
1 parent 31c376e
commit 5d101c9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/fog/libvirt/models/compute/server.rb b/lib/fog/libvirt/models/compute/server.rb
@@ -96,6 +96,10 @@ def destroy(options={ :destroy_volumes => false, :flags => ::Libvirt::Domain::UN
           if flags.zero?
             service.vm_action(uuid, :undefine)
           else
+            # the test driver doesn't support UNDEFINE_NVRAM
+            if service.uri.driver == 'test'
+              flags ^= ::Libvirt::Domain::UNDEFINE_NVRAM
+            end
             service.vm_action(uuid, :undefine, flags)
           end
           volumes.each { |vol| vol.destroy } if options[:destroy_volumes]