fog-libvirt 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3de2f15e870acbea334029209818b107a75f7faefb83d638ef9e36a077a483c4
-  data.tar.gz: df8b3421cc1958a0891d3bdf96cadb0bf197f9cfef79252587784dcbc971d215
+  metadata.gz: 941c7ea65ed8253aeab0ae1b2284d2057cf68d7db28835001c16c6b148e65584
+  data.tar.gz: dead71f5518e86f13f4f9d702bedb84f08614c459f96e9382d55ed54e123dab1
 SHA512:
-  metadata.gz: 2ceae4dbf135743de2de5b8b413f7d752339699224ea1c15f4c7b560df3e7f327de54dec01010ae46fbec83efa051a28a7d77a6db0ae7798f06a8e63f1b4d731
-  data.tar.gz: 9f749dddf5019f45ad4c4fc7672ca572157a8fdc9e0ce5024789a08261d5e30a91629832866132554930a4445bbe4ef697cb0afad9f72ec339b5b3045b277c74
+  metadata.gz: 9867bd44870aa6fcbf32378f8124a70b2873bdd5074bb644681a1a40be22db8546e770259b552f715944515ab724d87c5f885c71d41ba8f86262d546679635b2
+  data.tar.gz: 5fa4b1b63fa25a7387d8d0403c930b0134772d785cffb3660964093080fbfee5edd77f100710d07f31d228ca475ddaa1517913ac88195ac0328d43d3ce044b46

data/Rakefile

@@ -34,6 +34,7 @@ end
 #############################################################################
 
 GEM_NAME = "#{name}"
+ENV['COVERAGE'] ||= 'true'
 task :default => [:test, :minitest]
 
 Rake::TestTask.new(:minitest) do |t|
@@ -46,8 +47,7 @@ end
 
 desc 'Run tests'
 task :test do
-  mock = ENV['FOG_MOCK'] || 'true'
-  sh("export FOG_MOCK=#{mock} && bundle exec shindont tests")
+  sh("bundle exec shindont tests")
 end
 
 desc 'Run mocked tests'
@@ -60,6 +60,11 @@ task :live do
   sh("export FOG_MOCK=false && bundle exec shindont tests")
 end
 
+desc 'Run live libvirt qemu:///session tests'
+task :live_session do
+  sh("export FOG_LIBVIRT_URI=qemu:///session && bundle exec rake test minitest")
+end
+
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/fog/libvirt.rb"

data/fog-libvirt.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md]
 
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.0'
 
   s.add_dependency("fog-core", ">= 1.27.4")
   s.add_dependency("fog-json")

data/lib/fog/libvirt/models/compute/server.rb

@@ -259,11 +259,14 @@ module Fog
           user_data_path = File.join(dir_path, 'user-data')
           File.write(user_data_path, user_data)
 
-          isofile = Tempfile.new(['init', '.iso']).path
+          iso_tempfile = Tempfile.new(['init', '.iso'])
+          isofile = iso_tempfile.path
           unless system('xorrisofs', '-output', isofile, '-volid', 'cidata', '-joliet', '-rock', user_data_path, meta_data_path)
             raise Fog::Errors::Error.new("Couldn't generate cloud-init iso disk with xorrisofs.")
           end
           blk.call(isofile)
+        ensure
+          iso_tempfile&.close!
         end
 
         def create_user_data_iso
@@ -370,7 +373,9 @@ module Fog
                   else
                     is_block = volume.path.start_with?("/dev/")
                     xml.disk(:type => is_block ? "block" : "file", :device => "disk") do
-                      xml.driver(:name => "qemu", :type => volume.format_type)
+                      driver = xml.driver(:name => "qemu")
+                      driver[:type] = volume.format_type if volume.format_type
+
                       if is_block
                         xml.source(:dev => volume.path)
                       else
@@ -476,7 +481,11 @@ module Fog
         # if the server has multiple network interface
         def addresses(service_arg=service, options={})
           ip_address = nil
-          if (nic = self.nics&.first)
+          # Pick the first nic that actually has a network. Bridge/direct
+          # interfaces carry a nil network name, which can't be looked up and
+          # never has a libvirt-managed lease, so skip them in favour of a nic
+          # that can resolve to an address.
+          if (nic = self.nics&.find { |n| n.network })
             net = service.networks.all(:name => nic.network).first
             # Assume the lease expiring last is the current IP address
             ip_address = net&.dhcp_leases(nic.mac)&.max_by { |lse| lse["expirytime"] }&.dig("ipaddr")

data/lib/fog/libvirt/models/compute/volume.rb

@@ -91,7 +91,7 @@ module Fog
               xml.capacity(capacity_size, :unit => capacity_unit)
 
               xml.target do
-                xml.format(:type => format_type)
+                xml.format(:type => format_type) if format_type
                 xml_permissions(xml)
               end
 

data/lib/fog/libvirt/requests/compute/list_networks.rb

@@ -9,7 +9,7 @@ module Fog
               data << network_to_attributes(client.lookup_network_by_name(network_name))
             end
           else
-            data = [network_to_attributes(get_network_by_filter(filter))]
+            data = [network_to_attributes(get_network_by_filter(filter))].compact
           end
           data
         end
@@ -21,6 +21,8 @@ module Fog
             when :uuid
               client.lookup_network_by_uuid(filter[:uuid])
             when :name
+              return nil if filter[:name].nil?
+
               client.lookup_network_by_name(filter[:name])
           end
         end

data/lib/fog/libvirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Libvirt
-    VERSION = '0.15.0'
+    VERSION = '0.16.0'
   end
 end

data/minitests/network/network_test.rb

@@ -0,0 +1,33 @@
+require_relative "../test_helper"
+
+class NetworkTest < Minitest::Test
+  def setup
+    @network = Fog::Compute[:libvirt].networks.new(:name => "default", :uuid => "dd8fe884-6c02-601e-7551-cca97df1c5df", :bridge_name => "virbr0")
+  end
+
+  def test_model
+    assert_kind_of Fog::Libvirt::Compute::Network, @network
+
+    assert @network.respond_to? "reload"
+    assert @network.respond_to? "dhcp_leases"
+
+    assert_kind_of Array, @network.dhcp_leases("aa:bb:cc:dd:ee:ff", 0) if Fog.mock?
+
+    attributes = [:name, :uuid, :bridge_name]
+    attributes.each do |attribute|
+      assert @network.respond_to? attribute
+      assert @network.attributes.key? attribute
+    end
+  end
+
+  def test_to_xml
+    expected = <<~NETWORK
+      <?xml version="1.0"?>
+      <network>
+        <name>default</name>
+        <bridge name="virbr0" stp="on" delay="0"/>
+      </network>
+    NETWORK
+    assert_equal expected, @network.to_xml
+  end
+end

data/minitests/server/nil_network_address_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+# Bridge and direct interfaces have a nil network name. #addresses used to
+# pass that nil straight into a network lookup, which raised. It should instead
+# skip network-less nics and resolve an address from a nic that has one.
+class NilNetworkAddressTest < Minitest::Test
+  def setup
+    @compute = Fog::Compute[:libvirt]
+    @server = @compute.servers.new(:name => "test")
+  end
+
+  def test_returns_nil_without_raising_when_only_nic_has_no_network
+    bridge_nic = stub(:network => nil, :mac => "52:54:00:aa:bb:cc")
+    @server.stubs(:nics).returns([bridge_nic])
+    # No network is ever looked up, so the connection is never touched.
+    @server.service.expects(:networks).never
+
+    result = @server.send(:addresses)
+
+    assert_nil result[:public].first
+    assert_nil result[:private].first
+  end
+
+  def test_skips_network_less_nic_and_resolves_address_from_next
+    bridge_nic = stub(:network => nil, :mac => "52:54:00:aa:bb:cc")
+    nat_nic = stub(:network => "default", :mac => "52:54:00:01:02:03")
+    @server.stubs(:nics).returns([bridge_nic, nat_nic])
+
+    net = stub(:name => "default")
+    net.stubs(:dhcp_leases).with("52:54:00:01:02:03").returns([{ "expirytime" => 1000, "ipaddr" => "192.168.122.10" }])
+    networks = stub
+    networks.stubs(:all).with(:name => "default").returns([net])
+    @server.service.stubs(:networks).returns(networks)
+
+    result = @server.send(:addresses)
+
+    assert_equal "192.168.122.10", result[:public].first
+    assert_equal "192.168.122.10", result[:private].first
+  end
+end

data/minitests/test_helper.rb

@@ -1,3 +1,8 @@
+unless ['false', 'no', '0'].include?(ENV['COVERAGE'].to_s.downcase)
+  require 'simplecov'
+  SimpleCov.start
+end
+
 require 'minitest/autorun'
 require 'mocha/minitest'
 require 'fileutils'
@@ -12,7 +17,11 @@ FileUtils.rm_f Dir.glob 'test/tmp/*.tmp'
 
 require 'fog/libvirt'
 
-Fog.mock!
-Fog.credentials = {
-    :libvirt_uri => 'test:///default',
-}.merge(Fog.credentials)
+Fog.credentials[:libvirt_uri] = ENV.fetch("FOG_LIBVIRT_URI", "test:///default")
+
+def real_libvirt?
+  Fog.credentials[:libvirt_uri].start_with?("qemu")
+end
+
+enable_mocking = ENV.fetch("FOG_MOCK") { (!real_libvirt?).to_s }
+Fog.mock! unless ["false", "no", "0"].include?(enable_mocking)

data/tests/helper.rb

@@ -1,6 +1,12 @@
 ENV['FOG_RC']         = ENV['FOG_RC'] || File.expand_path('../.fog', __FILE__)
 ENV['FOG_CREDENTIAL'] = ENV['FOG_CREDENTIAL'] || 'default'
 
+unless ['false', 'no', '0'].include?(ENV['COVERAGE'].to_s.downcase)
+  require 'simplecov'
+  SimpleCov.start
+  SimpleCov.command_name 'Shindo'
+end
+
 require 'fog/libvirt'
 
 Excon.defaults.merge!(:debug_request => true, :debug_response => true)
@@ -15,3 +21,7 @@ if Fog.mocking?
 else
   FOG_TESTING_TIMEOUT = Fog.timeout
 end
+
+Thread.current[:tags] ||= []
+Thread.current[:tags] << "-requires-mocks" unless Fog.mock?
+Thread.current[:tags] << (real_libvirt? ? "-requires-test-driver" : "-requires-real-libvirt")

data/tests/helpers/mock_helper.rb

@@ -2,13 +2,11 @@
 #
 # FOG_MOCK=true fog
 
-if ENV["FOG_MOCK"] == "true"
-  Fog.mock!
-end
+Fog.credentials[:libvirt_uri] = ENV.fetch("FOG_LIBVIRT_URI", "test:///default")
 
-# if in mocked mode, fill in some fake credentials for us
-if Fog.mock?
-  Fog.credentials = {
-    :libvirt_uri => 'test:///default',
-  }.merge(Fog.credentials)
+def real_libvirt?
+  Fog.credentials[:libvirt_uri].start_with?("qemu")
 end
+
+enable_mocking = ENV.fetch("FOG_MOCK") { (!real_libvirt?).to_s }
+Fog.mock! unless ["false", "no", "0"].include?(enable_mocking)

data/tests/libvirt/models/compute/networks_tests.rb

@@ -5,7 +5,7 @@ Shindo.tests('Fog::Compute[:libvirt] | networks collection', ['libvirt']) do
   tests('The networks collection') do
     test('should be a kind of Fog::Libvirt::Compute::Networks') { networks.kind_of? Fog::Libvirt::Compute::Networks }
     tests('should be able to reload itself').succeeds { networks.reload }
-    tests('should be able to get a model') do
+    tests('should be able to get a model', 'requires-test-driver') do
       tests('by instance id').succeeds { networks.get networks.first.uuid }
     end
   end

data/tests/libvirt/models/compute/nic_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Fog::Compute[:libvirt] | nic model', ['libvirt']) do
 
-  server = Fog::Compute[:libvirt].servers.create(:name => Fog::Mock.random_letters(8))
+  server = Fog::Compute[:libvirt].servers.create(:name => "fog-nic-test-#{Fog::Mock.random_letters(8)}")
   nic = server.nics.first
 
   tests('The nic model should') do
@@ -28,5 +28,6 @@ Shindo.tests('Fog::Compute[:libvirt] | nic model', ['libvirt']) do
     end
     test('be a kind of Fog::Libvirt::Compute::Nic') { nic.kind_of? Fog::Libvirt::Compute::Nic }
   end
-
+ensure
+  server&.destroy(:destroy_volumes => true)
 end

data/tests/libvirt/models/compute/server_tests.rb

@@ -2,8 +2,8 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
 
   servers = Fog::Compute[:libvirt].servers
   # Match the mac in dhcp_leases mock
-  nics = Fog.mock? ? [{ :type => 'network', :network => 'default', :mac => 'aa:bb:cc:dd:ee:ff' }] : nil
-  server = servers.create(:name => Fog::Mock.random_letters(8), :nics => nics)
+  nics = Fog.mock? ? [{ :type => 'network', :network => 'default', :mac => 'aa:bb:cc:dd:ee:ff' }] : []
+  server = servers.create(:name => "fog-server-test-#{Fog::Mock.random_letters(8)}", :nics => nics)
 
   tests('The server model should') do
     tests('have the action') do
@@ -24,7 +24,7 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
         }
       end
     end
-    tests('have an ip_address action that') do
+    tests('have an ip_address action that', 'requires-mocks') do
       test('returns the latest IP address lease') { server.public_ip_address() == '1.2.5.6' }
     end
     tests('have attributes') do
@@ -66,7 +66,9 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
     end
 
     test('can destroy') do
-      servers.create(:name => Fog::Mock.random_letters(8)).destroy
+      server_name = "fog-test-destroy-#{Fog::Mock.random_letters(8)}"
+      servers.create(:name => server_name).destroy(:destroy_volumes => true)
+      servers.all.none? { |server| server.name == server_name }
     end
 
     test('be a kind of Fog::Libvirt::Compute::Server') { server.kind_of? Fog::Libvirt::Compute::Server }
@@ -78,7 +80,7 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
         xml.match?(/<disk type="file" device="disk">/) && xml.match?(%r{<source file="#{server.volumes.first.path}"/>})
       end
       test("with disk of type block") do
-        server = Fog::Libvirt::Compute::Server.new(
+        disk_server = Fog::Libvirt::Compute::Server.new(
           {
             :nics => [],
             :volumes => [
@@ -86,20 +88,20 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
             ]
           }
         )
-        xml = server.to_xml
+        xml = disk_server.to_xml
         xml.match?(/<disk type="block" device="disk">/) && xml.match?(%r{<source dev="/dev/sda"/>})
       end
-      test("with q35 machine type on x86_64") { server.to_xml.match?(%r{<type arch="x86_64" machine="q35">hvm</type>}) }
+      test("with q35 machine type on x86_64") { server.to_xml.include?('<type arch="x86_64" machine="q35">') }
     end
     test("with efi firmware") do
-      server = Fog::Libvirt::Compute::Server.new(
+      efi_server = Fog::Libvirt::Compute::Server.new(
         {
           :firmware => "efi",
           :nics => [],
           :volumes => []
         }
       )
-      xml = server.to_xml
+      xml = efi_server.to_xml
 
       os_firmware = xml.include?('<os firmware="efi">')
       secure_boot = xml.include?('<feature name="secure-boot" enabled="no"/>')
@@ -108,7 +110,7 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
       os_firmware && secure_boot && loader_attributes
     end
     test("with secure boot enabled") do
-      server = Fog::Libvirt::Compute::Server.new(
+      secure_server = Fog::Libvirt::Compute::Server.new(
         {
           :firmware => "efi",
           :firmware_features => {
@@ -120,7 +122,7 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
           :volumes => []
         }
       )
-      xml = server.to_xml
+      xml = secure_server.to_xml
 
       os_firmware = xml.include?('<os firmware="efi">')
       secure_boot = xml.include?('<feature name="secure-boot" enabled="yes"/>')
@@ -129,5 +131,44 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
 
       os_firmware && secure_boot && enrolled_keys && loader_attributes
     end
+
+    test("with volumes") do
+      pool = Fog::Compute[:libvirt].pools.create(
+        :persistent => true,
+        :xml => <<~XML
+          <pool type='logical'>
+            <name>fog-test-lvm-pool</name>
+            <source>
+              <name>vg_storage01</name>
+              <format type='lvm2'/>
+            </source>
+            <target>
+              <path>/dev/vg_storage01</path>
+            </target>
+          </pool>
+        XML
+      )
+      volume_server = Fog::Compute[:libvirt].servers.new(
+        :nics => [],
+        :volumes => [
+          {
+            :path => "/dev/vg_storage01/volume01",
+            :pool_name => pool.name
+          }
+        ]
+      )
+      volume_server.volumes.each do |volume|
+        volume.save
+        # mock driver doesn't simulate the real thing
+        # LVM doesn't have a volume type
+        volume.format_type = nil
+      end
+      !volume_server.save.nil?
+    ensure
+      volume_server&.destroy(:destroy_volumes => true)
+      pool&.destroy
+    end
   end
+ensure
+  server&.destroy(:destroy_volumes => true)
 end

data/tests/libvirt/models/compute/volume_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Fog::Compute[:libvirt] | volume model', ['libvirt']) do
 
-  volume = Fog::Compute[:libvirt].volumes.create(:name => 'fog_test')
+  volume = Fog::Compute[:libvirt].volumes.create(:name => 'fog_test', :capacity => '1G')
 
   tests('The volume model should') do
     tests('have attributes') do
@@ -29,10 +29,12 @@ Shindo.tests('Fog::Compute[:libvirt] | volume model', ['libvirt']) do
 
   tests('Cloning volumes should') do
     test('respond to clone_volume') { volume.respond_to? :clone_volume }
-    new_vol = volume.clone_volume('new_vol')
+    new_vol = volume.clone_volume('fog-test-new_vol')
     # We'd like to test that the :name attr has changed, but it seems that's
     # not possible, so we can at least check the new_vol xml exists properly
     test('succeed') { volume.xml == new_vol.xml }
+  ensure
+    new_vol&.destroy
   end
 
   test('to_xml') do
@@ -42,7 +44,7 @@ Shindo.tests('Fog::Compute[:libvirt] | volume model', ['libvirt']) do
         <volume>
           <name>fog_test</name>
           <allocation unit="G">1</allocation>
-          <capacity unit="G">10</capacity>
+          <capacity unit="G">1</capacity>
           <target>
             <format type="raw"/>
             <permissions>
@@ -55,4 +57,6 @@ Shindo.tests('Fog::Compute[:libvirt] | volume model', ['libvirt']) do
       volume.to_xml == expected
     end
   end
+ensure
+  volume&.destroy
 end

data/tests/libvirt/models/compute/volumes_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests('Fog::Compute[:libvirt] | volumes collection', ['libvirt']) do
 
   volumes = Fog::Compute[:libvirt].volumes
 
-  volumes.create(:name => 'test')
+  created_volume = volumes.create(:name => 'fog-test-volume')
 
   tests('The volumes collection') do
     test('should not be empty') { not volumes.empty? }
@@ -11,7 +11,8 @@ Shindo.tests('Fog::Compute[:libvirt] | volumes collection', ['libvirt']) do
     tests('should be able to get a model') do
       tests('by instance uuid').succeeds { volumes.get volumes.first.id }
     end
-    test('filtered should be empty') { volumes.all(:name => "does-not-exist").empty? }
+    test('filtered should be empty') { volumes.all(:name => "fog-test-volume-does-not-exist").empty? }
   end
-
+ensure
+  created_volume&.destroy
 end

data/tests/libvirt/requests/compute/create_domain_tests.rb

@@ -1,7 +1,9 @@
 Shindo.tests("Fog::Compute[:libvirt] | create_domain request", 'libvirt') do
 
   compute = Fog::Compute[:libvirt]
-  xml = compute.servers.new( :nics => [{:bridge => "br180"}]).to_xml
+
+  server = compute.servers.new(:name => "fog-test-create-server", :nics => [])
+  xml = server.to_xml
 
   tests("Create Domain") do
     response = compute.create_domain(xml)
@@ -17,5 +19,7 @@ Shindo.tests("Fog::Compute[:libvirt] | create_domain request", 'libvirt') do
       test("error should be a kind of Libvirt::Error") { e.kind_of?  Libvirt::Error}
     end
   end
-
+ensure
+  server_uuid = compute.servers.all(:name => server.name).first&.uuid
+  compute.servers.service.vm_action(server_uuid, :destroy) if server_uuid
 end

data/tests/libvirt/requests/compute/define_domain_tests.rb

@@ -1,11 +1,14 @@
 Shindo.tests("Fog::Compute[:libvirt] | define_domain request", 'libvirt') do
 
   compute = Fog::Compute[:libvirt]
-  xml = compute.servers.new().to_xml
+  server = compute.servers.new(:name => "fog-test-define-server", :nics => [])
+  xml = server.to_xml
 
   tests("Define Domain") do
     response = compute.define_domain(xml)
     test("should be a kind of Libvirt::Domain") { response.kind_of?  Libvirt::Domain}
   end
-
+ensure
+  server_uuid = compute.servers.all(:name => server.name).first&.uuid
+  compute.servers.service.vm_action(server_uuid, :undefine) if server_uuid
 end

data/tests/libvirt/requests/compute/dhcp_leases_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests("Fog::Compute[:libvirt] | dhcp_leases request", 'libvirt') do
 
   compute = Fog::Compute[:libvirt]
 
-  tests("DHCP leases response") do
+  tests("DHCP leases response", "requires-mocks") do
     response = compute.dhcp_leases("fbd4ac68-cbea-4f95-86ed-22953fd92384", "99:88:77:66:55:44", 0)
     test("should be an array") { response.kind_of? Array }
     test("should have one element") { response.length == 1 }

data/tests/libvirt/requests/compute/list_pools_tests.rb

@@ -41,7 +41,9 @@ Shindo.tests("Fog::Compute[:libvirt] | list_pools request", 'libvirt') do
   tests("Lists Pools") do
     response = compute.list_pools
     test("should be an array") { response.kind_of? Array }
-    test("should have two pools") { response.length == 1 }
+    tests("Test Driver", "requires-test-driver") do
+      test("should have a pool") { response.length == 1 }
+    end
   end
 
   tests("Handle Inactive Pools") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - geemus (Wesley Beary)
@@ -268,6 +268,8 @@ files:
 - lib/fog/libvirt/requests/compute/vm_action.rb
 - lib/fog/libvirt/requests/compute/volume_action.rb
 - lib/fog/libvirt/version.rb
+- minitests/network/network_test.rb
+- minitests/server/nil_network_address_test.rb
 - minitests/server/user_data_iso_test.rb
 - minitests/test_helper.rb
 - tests/helper.rb
@@ -278,7 +280,6 @@ files:
 - tests/libvirt/compute_tests.rb
 - tests/libvirt/models/compute/interface_tests.rb
 - tests/libvirt/models/compute/interfaces_tests.rb
-- tests/libvirt/models/compute/network_tests.rb
 - tests/libvirt/models/compute/networks_tests.rb
 - tests/libvirt/models/compute/nic_tests.rb
 - tests/libvirt/models/compute/nics_tests.rb
@@ -306,14 +307,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.22
 specification_version: 2
 summary: Module for the 'fog' gem to support libvirt
 test_files:
@@ -325,7 +326,6 @@ test_files:
 - tests/libvirt/compute_tests.rb
 - tests/libvirt/models/compute/interface_tests.rb
 - tests/libvirt/models/compute/interfaces_tests.rb
-- tests/libvirt/models/compute/network_tests.rb
 - tests/libvirt/models/compute/networks_tests.rb
 - tests/libvirt/models/compute/nic_tests.rb
 - tests/libvirt/models/compute/nics_tests.rb

data/tests/libvirt/models/compute/network_tests.rb

@@ -1,43 +0,0 @@
-Shindo.tests('Fog::Compute[:libvirt] | network model', ['libvirt']) do
-
-  networks = Fog::Compute[:libvirt].networks
-  network = networks.first
-
-  tests('The network model should') do
-    tests('have the action') do
-      test('reload') { network.respond_to? 'reload' }
-      test('dhcp_leases') { network.respond_to? 'dhcp_leases' }
-    end
-    tests('have a dhcp_leases action that') do
-      test('returns an array') { network.dhcp_leases('aa:bb:cc:dd:ee:ff', 0).kind_of? Array }
-    end
-    tests('have attributes') do
-      model_attribute_hash = network.attributes
-      attributes = [ :name, :uuid, :bridge_name]
-      tests("The network model should respond to") do
-        attributes.each do |attribute|
-          test("#{attribute}") { network.respond_to? attribute }
-        end
-      end
-      tests("The attributes hash should have key") do
-        attributes.each do |attribute|
-          test("#{attribute}") { model_attribute_hash.key? attribute }
-        end
-      end
-    end
-    test('be a kind of Fog::Libvirt::Compute::Network') { network.kind_of? Fog::Libvirt::Compute::Network }
-  end
-
-  tests("to_xml") do
-    test("default") do
-      expected = <<~NETWORK
-        <?xml version="1.0"?>
-        <network>
-          <name>default</name>
-          <bridge name="virbr0" stp="on" delay="0"/>
-        </network>
-      NETWORK
-      network.to_xml == expected
-    end
-  end
-end