fog-libvirt 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41b14c1f0524040fcbc157e504813ffe2514dbd3430c88909da1d531ec36c140
-  data.tar.gz: c0fedd19c37d2e5a864336ac9a51f1c4de026f1c6f6120e186153afcbfc5792a
+  metadata.gz: f3f3d3db14311de4008b43186334103d78f393b03f30282fc6276c1c5f3a7bd3
+  data.tar.gz: acdeffc9be9ca8fa2d2fe5065616b9c7a14c4415b03359437500cfd7c47f63f0
 SHA512:
-  metadata.gz: 584d715816d4ccea8933a43182288aa76f0c49d39f5358892c0e72e3c55c8649fe70092bf4e7046202e95e6e15e8a7de6ebcc07042b55fb1635c6168841adf29
-  data.tar.gz: 61804dd8912bfdee1299275fe0961c0f36e3328233b65db9a23e9f21dd9843134c071c70562c7abec6643ba35b817201b25a9eea4787abaef0639e551ffd6fa9
+  metadata.gz: e0cb8dbd4c13fd8aa4540e8da830d5853b4507c87795edb3aeb03f644d68d895405e7ed804795b70cf0921fb3a54586f6c912ee67eb52abb4e8e7ee07212bfa6
+  data.tar.gz: 8e0f16895181fc4becbf81a3a08d215b39be6d77414425fd2238b696b313c9fd9931f23ce38af538f109d403e50aa4430fa674266050c3698f703331762cdec5

data/lib/fog/libvirt/compute.rb

@@ -44,6 +44,7 @@ module Fog
       request :list_interfaces
       request :destroy_interface
       request :get_node_info
+      request :update_autostart
       request :update_display
       request :libversion
 

data/lib/fog/libvirt/models/compute/README.md

@@ -35,10 +35,13 @@ port=6789
 libvirt_ceph_pool=rbd_pool_name
 auth_username=libvirt
 auth_uuid=uuid_of_libvirt_secret
+bus_type=virtio
 ```
 For more recent versions of libvirt which support using the secret by name (`usage` attribute in the `secret` tag),
 you can also drop `auth_uuid` and specify `auth_usage` instead. If both are specified, `auth_uuid` will be preferred for maximum compatibility.
 
+The `bus_type` can be set to `virtio` or `scsi`. If it is ommited, the default is `scsi`.
+
 ## Configuration
 
 The URI can be configured in two ways:

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

@@ -30,6 +30,7 @@ module Fog
         attribute :cpu
         attribute :hugepages
         attribute :guest_agent
+        attribute :virtio_rng
 
         attribute :state
 
@@ -77,6 +78,10 @@ module Fog
           action_status
         end
 
+        def update_autostart(value)
+          service.update_autostart(uuid, value)
+        end
+
         def mac
           nics.first.mac if nics && nics.first
         end
@@ -131,9 +136,10 @@ module Fog
         end
 
         #alias methods
-        alias_method :halt,    :poweroff
-        alias_method :stop,    :shutdown
-        alias_method :active?, :active
+        alias_method :halt,       :poweroff
+        alias_method :stop,       :shutdown
+        alias_method :active?,    :active
+        alias_method :autostart?, :autostart
 
         def volumes
           # lazy loading of volumes
@@ -473,6 +479,7 @@ module Fog
             :os_type                => "hvm",
             :arch                   => "x86_64",
             :domain_type            => "kvm",
+            :autostart              => false,
             :iso_dir                => default_iso_dir,
             :network_interface_type => "network",
             :network_nat_network    => "default",
@@ -482,6 +489,7 @@ module Fog
             :cpu                    => {},
             :hugepages              => false,
             :guest_agent            => true,
+            :virtio_rng             => {},
           }
         end
 

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

@@ -52,9 +52,11 @@
     <disk type='network' device='disk'>
       <driver name='qemu' type='<%= vol.format_type %>' cache='writeback' discard='unmap'/>
       <source protocol='rbd' name='<%= vol.path %>'>
+      <% if args.key?("monitor") -%>
         <% args["monitor"].split(",").each do |mon| %>
         <host name='<%= mon %>' port='<%= args["port"] %>'/>
         <% end %>
+      <% end %>
       </source>
       <auth username='<%= args["auth_username"] %>'>
        <% if args.key?("auth_uuid") -%>
@@ -63,7 +65,11 @@
         <secret type='ceph' usage='<%= args["auth_usage"] %>'/>
        <% end -%>
       </auth>
-      <target dev='sd<%= ('a'..'z').to_a[volumes.index(vol)] %>' bus='scsi'/>
+      <% if args['bus_type'] == 'virtio' %>
+        <target dev='vd<%= ('a'..'z').to_a[volumes.index(vol)] %>' bus='virtio'/>
+      <% else %>
+        <target dev='sd<%= ('a'..'z').to_a[volumes.index(vol)] %>' bus='scsi'/>
+      <% end %>
     </disk>
   <% else %>
     <disk type='file' device='disk'>
@@ -94,6 +100,16 @@
       <target type='virtio' name='org.qemu.guest_agent.0'/>
     </channel>
 <% end -%>
+    <rng model='virtio'>
+<%
+  rng_backend_model = virtio_rng[:backend_model] ? virtio_rng[:backend_model] : 'random'
+-%>
+<% if virtio_rng[:backend_path] -%>
+      <backend model='<%= rng_backend_model %>'><%= virtio_rng[:backend_path] %></backend>
+<% else -%>
+      <backend model='<%= rng_backend_model %>'/>
+<% end -%>
+    </rng>
     <serial type='pty'>
       <target port='0'/>
     </serial>

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

@@ -25,12 +25,20 @@ module Fog
           end
         end
 
+        # bridge name may not be defined in some networks, we should skip that in such case
         def network_to_attributes(net)
           return if net.nil?
+
+          begin
+            bridge_name = net.bridge_name
+          rescue Libvirt::Error
+            bridge_name = ''
+          end
+
           {
             :uuid        => net.uuid,
             :name        => net.name,
-            :bridge_name => net.bridge_name
+            :bridge_name => bridge_name
           }
         end
       end

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

@@ -17,7 +17,7 @@ module Fog
               end
             end
           else
-            return [get_volume(filter)]
+            data << get_volume(filter)
           end
           data.compact
         end
@@ -69,7 +69,8 @@ module Fog
               return raw ? vol : volume_to_attributes(vol)
             end
           end
-          { }
+
+          nil
         end
       end
 
@@ -77,15 +78,22 @@ module Fog
         def list_volumes(filters={ })
           vol1 = mock_volume 'vol1'
           vol2 = mock_volume 'vol2'
-          [vol1, vol2]
+          vols = [vol1, vol2]
+
+          if filters.keys.empty?
+            return vols
+          end
+
+          key = filters.keys.first
+          vols.select { |v| v[key] == filters[key] }
         end
 
         def mock_volume name
           {
               :pool_name   => 'vol.pool.name',
-              :key         => 'vol.key',
-              :id          => 'vol.key',
-              :path        => 'vol.path',
+              :key         => "vol.#{name}", # needs to match id
+              :id          => "vol.#{name}",
+              :path        => "path/to/disk", # used by in mock_files/domain.xml
               :name        => name,
               :format_type => 'raw',
               :allocation  => 123,

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

@@ -0,0 +1,18 @@
+module Fog
+  module Libvirt
+    class Compute
+      class Real
+        def update_autostart(uuid, value)
+          domain = client.lookup_domain_by_uuid(uuid)
+          domain.autostart = value
+        end
+      end
+
+      class Mock
+        def update_autostart(uuid, value)
+          value
+        end
+      end
+    end
+  end
+end

data/lib/fog/libvirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Libvirt
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

data/tests/libvirt/compute_tests.rb

@@ -9,7 +9,8 @@ Shindo.tests('Fog::Compute[:libvirt]', ['libvirt']) do
   end
 
   tests("Compute requests") do
-    %w{ create_domain create_volume define_domain define_pool destroy_interface destroy_network get_node_info list_domains
+    %w{ create_domain create_volume define_domain define_pool destroy_interface destroy_network get_node_info
+        update_autostart list_domains
         list_interfaces list_networks list_pools list_pool_volumes list_volumes pool_action vm_action volume_action
         dhcp_leases }.each do |request|
       test("it should respond to #{request}") { compute.respond_to? request }

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

@@ -5,6 +5,8 @@ Shindo.tests('Fog::Compute[:libvirt] | server model', ['libvirt']) do
 
   tests('The server model should') do
     tests('have the action') do
+      test('autostart') { server.respond_to? 'autostart' }
+      test('update_autostart') { server.respond_to? 'update_autostart' }
       test('reload') { server.respond_to? 'reload' }
       %w{ start stop destroy reboot suspend }.each do |action|
         test(action) { server.respond_to? action }

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

@@ -9,6 +9,7 @@ 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? }
   end
 
 end

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

@@ -0,0 +1,12 @@
+Shindo.tests('Fog::Compute[:libvirt] | update_autostart request', ['libvirt']) do
+
+  servers = Fog::Compute[:libvirt].servers
+
+  tests('The response should') do
+    test('should not be empty') { not servers.empty? }
+    server = servers.first
+    tests('should be false').succeeds { server.autostart == false }
+    server.update_autostart(true)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - geemus (Wesley Beary)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2021-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -276,6 +276,7 @@ files:
 - 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
 - lib/fog/libvirt/requests/compute/upload_volume.rb
 - lib/fog/libvirt/requests/compute/vm_action.rb
@@ -305,12 +306,13 @@ files:
 - tests/libvirt/requests/compute/create_domain_tests.rb
 - tests/libvirt/requests/compute/define_domain_tests.rb
 - tests/libvirt/requests/compute/dhcp_leases_tests.rb
+- tests/libvirt/requests/compute/update_autostart_tests.rb
 - tests/libvirt/requests/compute/update_display.rb
 homepage: http://github.com/fog/fog-libvirt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -326,8 +328,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 2
 summary: Module for the 'fog' gem to support libvirt
 test_files:
@@ -352,4 +354,5 @@ test_files:
 - tests/libvirt/requests/compute/create_domain_tests.rb
 - tests/libvirt/requests/compute/define_domain_tests.rb
 - tests/libvirt/requests/compute/dhcp_leases_tests.rb
+- tests/libvirt/requests/compute/update_autostart_tests.rb
 - tests/libvirt/requests/compute/update_display.rb