fog-libvirt 0.12.2 → 0.13.1

data/tests/helpers/formats_helper_tests.rb

@@ -1,8 +1,8 @@
 Shindo.tests('test_helper', 'meta') do
 
   tests('comparing welcome data against schema') do
-    data = { welcome: 'Hello' }
-    data_matches_schema(welcome: String) { data }
+    data = { :welcome => 'Hello' }
+    data_matches_schema(:welcome => String) { data }
   end
 
   tests('#data_matches_schema') do
@@ -15,7 +15,7 @@ Shindo.tests('test_helper', 'meta') do
     end
 
     tests('when nested values match schema expectation') do
-      data_matches_schema('key' => { nested_key: String }) { { 'key' => { nested_key: 'Value' } } }
+      data_matches_schema('key' => { :nested_key => String }) { { 'key' => { :nested_key => 'Value' } } }
     end
 
     tests('when collection of values all match schema expectation') do
@@ -23,11 +23,11 @@ Shindo.tests('test_helper', 'meta') do
     end
 
     tests('when collection is empty although schema covers optional members') do
-      data_matches_schema([{ 'key' => String }], allow_optional_rules: true) { [] }
+      data_matches_schema([{ 'key' => String }], :allow_optional_rules => true) { [] }
     end
 
     tests('when additional keys are passed and not strict') do
-      data_matches_schema({ 'key' => String }, allow_extra_keys: true) { { 'key' => 'Value', extra: 'Bonus' } }
+      data_matches_schema({ 'key' => String }, :allow_extra_keys => true) { { 'key' => 'Value', :extra => 'Bonus' } }
     end
 
     tests('when value is nil and schema expects NilClass') do
@@ -47,11 +47,11 @@ Shindo.tests('test_helper', 'meta') do
     end
 
     tests('when key is missing but value should be NilClass (#1477)') do
-      data_matches_schema({ 'key' => NilClass }, allow_optional_rules: true) { {} }
+      data_matches_schema({ 'key' => NilClass }, :allow_optional_rules => true) { {} }
     end
 
     tests('when key is missing but value is nullable (#1477)') do
-      data_matches_schema({ 'key' => Fog::Nullable::String }, allow_optional_rules: true) { {} }
+      data_matches_schema({ 'key' => Fog::Nullable::String }, :allow_optional_rules => true) { {} }
     end
   end
 
@@ -65,7 +65,7 @@ Shindo.tests('test_helper', 'meta') do
     end
 
     tests('when nested values match schema expectation') do
-      formats('key' => { nested_key: String }) { { 'key' => { nested_key: 'Value' } } }
+      formats('key' => { :nested_key => String }) { { 'key' => { :nested_key => 'Value' } } }
     end
 
     tests('when collection of values all match schema expectation') do

data/tests/helpers/mock_helper.rb

@@ -9,6 +9,6 @@ end
 # if in mocked mode, fill in some fake credentials for us
 if Fog.mock?
   Fog.credentials = {
-    libvirt_uri:                       'qemu://libvirt/system',
+    :libvirt_uri => 'test:///default',
   }.merge(Fog.credentials)
 end

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

@@ -1,7 +1,7 @@
 Shindo.tests('Fog::Compute[:libvirt] | network model', ['libvirt']) do
 
   networks = Fog::Compute[:libvirt].networks
-  network = networks.last
+  network = networks.first
 
   tests('The network model should') do
     tests('have the action') do
@@ -9,7 +9,7 @@ Shindo.tests('Fog::Compute[:libvirt] | network model', ['libvirt']) do
       test('dhcp_leases') { network.respond_to? 'dhcp_leases' }
     end
     tests('have a dhcp_leases action that') do
-      test('returns an array') { network.dhcp_leases('99:88:77:66:55:44', 0).kind_of? Array }
+      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
@@ -28,4 +28,16 @@ Shindo.tests('Fog::Compute[:libvirt] | network model', ['libvirt']) do
     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

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

@@ -1,6 +1,7 @@
 Shindo.tests('Fog::Compute[:libvirt] | nic model', ['libvirt']) do
 
-  nic = Fog::Compute[:libvirt].servers.all.select{|v| v.name =~ /^fog/}.first.nics.first
+  server = Fog::Compute[:libvirt].servers.create(:name => Fog::Mock.random_letters(8))
+  nic = server.nics.first
 
   tests('The nic model should') do
     tests('have the action') do

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

@@ -3,11 +3,11 @@ Shindo.tests('Fog::Compute[:libvirt] | pools request', ['libvirt']) do
   pools = Fog::Compute[:libvirt].pools
 
   tests('The pools collection') do
-      test('should not be empty') { not pools.empty? }
-      test('should be a kind of Fog::Libvirt::Compute::Pools') { pools.kind_of? Fog::Libvirt::Compute::Pools }
-      tests('should be able to reload itself').succeeds { pools.reload }
-      tests('should be able to get a model') do
-        tests('by instance id').succeeds { pools.get pools.first.uuid }
-      end
+    test('should not be empty') { not pools.empty? }
+    test('should be a kind of Fog::Libvirt::Compute::Pools') { pools.kind_of? Fog::Libvirt::Compute::Pools }
+    tests('should be able to reload itself').succeeds { pools.reload }
+    tests('should be able to get a model') do
+      tests('by instance id').succeeds { pools.get pools.first.uuid }
     end
+  end
 end

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

@@ -1,7 +1,9 @@
 Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
 
   servers = Fog::Compute[:libvirt].servers
-  server = servers.all.select{|v| v.name =~ /^fog/}.last
+  # 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)
 
   tests('The server model should') do
     tests('have the action') do
@@ -11,7 +13,7 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
       %w{ start stop destroy reboot suspend }.each do |action|
         test(action) { server.respond_to? action }
       end
-      %w{ start reboot suspend stop destroy}.each do |action|
+      %w{ start reboot suspend stop }.each do |action|
         test("#{action} returns successfully") {
           begin
             server.send(action.to_sym)
@@ -30,6 +32,10 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
       attributes = [ :id,
         :cpus,
         :cputime,
+        :firmware,
+        :firmware_features,
+        :secure_boot,
+        :loader_attributes,
         :os_type,
         :memory_size,
         :max_memory_size,
@@ -58,12 +64,18 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
         end
       end
     end
+
+    test('can destroy') do
+      servers.create(:name => Fog::Mock.random_letters(8)).destroy
+    end
+
     test('be a kind of Fog::Libvirt::Compute::Server') { server.kind_of? Fog::Libvirt::Compute::Server }
     tests("serializes to xml") do
+      test("without firmware") { server.to_xml.include?("<os>") }
       test("with memory") { server.to_xml.match?(%r{<memory>\d+</memory>}) }
       test("with disk of type file") do
         xml = server.to_xml
-        xml.match?(/<disk type="file" device="disk">/) && xml.match?(%r{<source file="path/to/disk"/>})
+        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(
@@ -79,5 +91,43 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
       end
       test("with q35 machine type on x86_64") { server.to_xml.match?(%r{<type arch="x86_64" machine="q35">hvm</type>}) }
     end
+    test("with efi firmware") do
+      server = Fog::Libvirt::Compute::Server.new(
+        {
+          :firmware => "efi",
+          :nics => [],
+          :volumes => []
+        }
+      )
+      xml = server.to_xml
+
+      os_firmware = xml.include?('<os firmware="efi">')
+      secure_boot = xml.include?('<feature name="secure-boot" enabled="no"/>')
+      loader_attributes = !xml.include?('<loader secure="yes"/>')
+
+      os_firmware && secure_boot && loader_attributes
+    end
+    test("with secure boot enabled") do
+      server = Fog::Libvirt::Compute::Server.new(
+        {
+          :firmware => "efi",
+          :firmware_features => {
+            "secure-boot" => "yes",
+            "enrolled-keys" => "yes"
+          },
+          :loader_attributes => { "secure" => "yes" },
+          :nics => [],
+          :volumes => []
+        }
+      )
+      xml = server.to_xml
+
+      os_firmware = xml.include?('<os firmware="efi">')
+      secure_boot = xml.include?('<feature name="secure-boot" enabled="yes"/>')
+      enrolled_keys = xml.include?('<feature name="enrolled-keys" enabled="yes"/>')
+      loader_attributes = xml.include?('<loader secure="yes"/>')
+
+      os_firmware && secure_boot && enrolled_keys && loader_attributes
+    end
   end
 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].servers.all.select{|v| v.name !~ /^fog/}.first.volumes.first
+  volume = Fog::Compute[:libvirt].volumes.create(:name => 'fog_test')
 
   tests('The volume model should') do
     tests('have attributes') do
@@ -35,4 +35,24 @@ Shindo.tests('Fog::Compute[:libvirt] | volume model', ['libvirt']) do
     test('succeed') { volume.xml == new_vol.xml }
   end
 
+  test('to_xml') do
+    test('default') do
+      expected = <<~VOLUME
+        <?xml version="1.0"?>
+        <volume>
+          <name>fog_test</name>
+          <allocation unit="G">1</allocation>
+          <capacity unit="G">10</capacity>
+          <target>
+            <format type="raw"/>
+            <permissions>
+              <mode>0744</mode>
+              <label>virt_image_t</label>
+            </permissions>
+          </target>
+        </volume>
+      VOLUME
+      volume.to_xml == expected
+    end
+  end
 end

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

@@ -2,6 +2,8 @@ Shindo.tests('Fog::Compute[:libvirt] | volumes collection', ['libvirt']) do
 
   volumes = Fog::Compute[:libvirt].volumes
 
+  volumes.create(:name => 'test')
+
   tests('The volumes collection') do
     test('should not be empty') { not volumes.empty? }
     test('should be a kind of Fog::Libvirt::Compute::Volumes') { volumes.kind_of? Fog::Libvirt::Compute::Volumes }

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

@@ -41,7 +41,7 @@ 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 == 2 }
+    test("should have two pools") { response.length == 1 }
   end
 
   tests("Handle Inactive Pools") do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.1
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -53,61 +53,81 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: ruby-libvirt
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: ruby-libvirt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -192,26 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.15'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.15'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 description: This library can be used as a module for 'fog' or as standalone libvirt
   provider.
 email: geemus@gmail.com
@@ -242,9 +242,6 @@ files:
 - lib/fog/libvirt/models/compute/pools.rb
 - lib/fog/libvirt/models/compute/server.rb
 - lib/fog/libvirt/models/compute/servers.rb
-- lib/fog/libvirt/models/compute/templates/network.xml.erb
-- lib/fog/libvirt/models/compute/templates/pool.xml.erb
-- lib/fog/libvirt/models/compute/templates/volume.xml.erb
 - lib/fog/libvirt/models/compute/util/uri.rb
 - lib/fog/libvirt/models/compute/util/util.rb
 - lib/fog/libvirt/models/compute/volume.rb
@@ -265,7 +262,6 @@ files:
 - lib/fog/libvirt/requests/compute/list_pool_volumes.rb
 - lib/fog/libvirt/requests/compute/list_pools.rb
 - lib/fog/libvirt/requests/compute/list_volumes.rb
-- lib/fog/libvirt/requests/compute/mock_files/domain.xml
 - lib/fog/libvirt/requests/compute/pool_action.rb
 - lib/fog/libvirt/requests/compute/update_autostart.rb
 - lib/fog/libvirt/requests/compute/update_display.rb
@@ -273,7 +269,6 @@ files:
 - lib/fog/libvirt/requests/compute/vm_action.rb
 - lib/fog/libvirt/requests/compute/volume_action.rb
 - lib/fog/libvirt/version.rb
-- minitests/server/server_test.rb
 - minitests/server/user_data_iso_test.rb
 - minitests/test_helper.rb
 - tests/helper.rb
@@ -313,14 +308,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 2
 summary: Module for the 'fog' gem to support libvirt

data/lib/fog/libvirt/models/compute/templates/network.xml.erb

@@ -1,6 +0,0 @@
-<network>
-  <name><%= name %></name>
-  <forward mode='<%= network_mode %>'/>
-  <bridge name='<%= bridge_name %>' stp='on' delay='0' />
-  </ip>
-</network>

data/lib/fog/libvirt/models/compute/templates/pool.xml.erb

@@ -1,6 +0,0 @@
-<pool type="dir">
-    <name><%= name %></name>
-    <target>
-      <path><%= path %></path>
-    </target>
-</pool>

data/lib/fog/libvirt/models/compute/templates/volume.xml.erb

@@ -1,34 +0,0 @@
-<volume>
-        <name><%= name %></name>
-        <allocation unit="<%= split_size_unit(allocation)[1] %>"><%= split_size_unit(allocation)[0] %></allocation>
-        <capacity unit="<%= split_size_unit(capacity)[1] %>"><%= split_size_unit(capacity)[0] %></capacity>
-        <target>
-          <format type="<%= format_type %>"/>
-          <permissions>
-            <% if owner -%>
-            <owner><%= owner %></owner>
-            <% end -%>
-            <% if group -%>
-            <group><%= group %></group>
-            <% end -%>
-            <mode>0744</mode>
-            <label>virt_image_t</label>
-          </permissions>
-        </target>
-        <% if backing_volume -%>
-        <backingStore>
-          <path><%= backing_volume.path %></path>
-          <format type="<%= backing_volume.format_type %>"/>
-          <permissions>
-            <% if owner -%>
-            <owner><%= owner %></owner>
-            <% end -%>
-            <% if group -%>
-            <group><%= group %></group>
-            <% end -%>
-            <mode>0744</mode>
-            <label>virt_image_t</label>
-          </permissions>
-        </backingStore>
-        <% end -%>
-</volume>

data/lib/fog/libvirt/requests/compute/mock_files/domain.xml

@@ -1,40 +0,0 @@
-<domain type='kvm'>
- <name>fog-449765558356062</name>
- <memory>262144</memory>
- <vcpu>1</vcpu>
- <os>
-  <type arch='x86_64'>hvm</type>
-  <boot dev='hd'/>
-  <boot dev='cdrom'/>
-  <boot dev='network'/>
- </os>
- <features>
-   <acpi/>
-   <apic/>
-   <pae/>
- </features>
- <clock offset='utc'/>
- <devices>
-  <interface type='network'>
-    <mac address="aa:bb:cc:dd:ee:ff" />
-    <source network='net1' />
-    <model type='virtio'/>
-  </interface>
-  <serial type='pty'>
-   <target port='0'/>
-  </serial>
-  <console type='pty'>
-    <target port='0'/>
-  </console>
-  <input type='mouse' bus='ps2'/>
-  <graphics type='vnc' port='-1' autoport='yes'/>
-  <video>
-   <model type='cirrus' vram='9216' heads='1'/>
-  </video>
-  <disk type='file' device='disk'>
-   <driver name='qemu' type='raw'/>
-   <source file='path/to/disk'/>
-   <target dev='vda' bus='virtio'/>
-  </disk>
- </devices>
-</domain>

data/minitests/server/server_test.rb

@@ -1,64 +0,0 @@
-require 'test_helper'
-
-class ServerTest < Minitest::Test
-  def setup
-    @compute = Fog::Compute[:libvirt]
-    @server = @compute.servers.new(:name => "test")
-  end
-
-  def test_addresses_calls_compat_version_for_no_dhcp_leases_support
-    network = Libvirt::Network.new
-    @compute.expects(:networks).returns([network])
-    network.expects(:dhcp_leases).raises(NoMethodError)
-    @server.expects(:addresses_ip_command).returns(true)
-
-    @server.send(:addresses)
-  end
-
-  def test_addresses_calls_compat_version_for_older_libvirt
-    network = Libvirt::Network.new
-    @compute.expects(:libversion).returns(1002007)
-    @compute.expects(:networks).returns([network])
-    network.expects(:dhcp_leases).returns(true)
-    @server.expects(:addresses_ip_command).returns(true)
-
-    @server.send(:addresses)
-  end
-
-  def test_addresses_calls_compat_version_for_newer_libvirt
-    network = Libvirt::Network.new
-    @compute.expects(:libversion).returns(1002008)
-    @compute.expects(:networks).returns([network])
-    network.expects(:dhcp_leases).returns(true)
-    @server.expects(:addresses_dhcp).returns(true)
-
-    @server.send(:addresses)
-  end
-
-  def test_ssh_ip_command_success
-    fog_ssh = Minitest::Mock.new
-    result = Minitest::Mock.new
-    result.expect(:status, 0)
-    result.expect(:stdout, "any_ip")
-    fog_ssh.expect(:run, [result], [String])
-    uri = ::Fog::Libvirt::Util::URI.new('qemu+ssh://localhost:22?keyfile=nofile')
-    Fog::SSH.stub(:new, fog_ssh) do
-      @server.send(:ssh_ip_command, "test command", uri)
-    end
-    fog_ssh.verify
-  end
-
-  def test_local_ip_command_success
-    proc_info = Minitest::Mock.new
-    proc_info.expect(:each_line, "127.0.0.1")
-    proc_info.expect(:pid, 0)
-    status = Minitest::Mock.new
-    status.expect(:exitstatus, 0)
-    Process.stubs(:waitpid2).returns([0, status])
-    IO.stub(:popen, true, proc_info) do
-      @server.send(:local_ip_command, "test command")
-    end
-    proc_info.verify
-    status.verify
-  end
-end