fog-libvirt 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c5d75c89309efc19a2a8e70db7f95dc754fe127358089bd8ebe0cd0f2ecf896
-  data.tar.gz: 2270fa713728f8824dffc45dca9344c1b244feeb3add91130d26fff493c00f18
+  metadata.gz: c7115a1bb2c554de544d464049d48c6a15f2b39499a729180ab0e37bab55d3f3
+  data.tar.gz: c38e323849b149376f72edacd821788aa9df923d7bd4ca334dd0792a1ade5fab
 SHA512:
-  metadata.gz: 1834c04363667e8bb7632055010f7544ec72aec0f49254e8c708bc1b73c0d731aa6474acd01644de9fa35d43491bfd5d7e60d3a6636d6301ba2446f6470b80cd
-  data.tar.gz: f6834023432a36058571b78e8c1b8f5ec5a5043990d8f738cbf7c986a9038a8a723415214fa702bc7ad09c83fbd119b961ea4ee5c0bc6ebd328b0ab744f12158
+  metadata.gz: dc0dd759cec37c6e89557dec04bc05a679150183474cf589509cf0a36d51a129bcfd521b0ecbb2682b8eb76ef1d2bd25f81bff8e3117ba35961fd8d8f2d1a285
+  data.tar.gz: f7f1661e4e48a4fdaa68475ca34eb6f35bd346981891ea7cdb49a4b05d236b2886bf125ffb51ec2538277d3b7fe7584f3338eea30e0c4011a4712290d7370533

data/README.md

@@ -18,6 +18,60 @@ $ sudo gem install fog-libvirt
 
 ## Usage
 
+Example REPL session:
+
+```
+>> require "fog/libvirt"
+=> true
+>> compute = Fog::Compute.new(provider: :libvirt, libvirt_uri: "qemu:///session")
+=> #<Fog::Libvirt::Compute::Real:46980 @uri=#<Fog::Libvirt::Util::URI:0x0000000002def920 @parsed_uri=#<URI::Generic qemu:/session>, @uri="qemu:///session"...
+>> server = compute.servers.create(name: "test")
+=>
+  <Fog::Libvirt::Compute::Server
+    id="bbb663e4-723b-4165-bc29-c77b54b12bca",
+    cpus=1,
+    cputime=0,
+    os_type="hvm",
+    memory_size=262144,
+    max_memory_size=262144,
+    name="test",
+    arch="x86_64",
+    persistent=true,
+    domain_type="kvm",
+    uuid="bbb663e4-723b-4165-bc29-c77b54b12bca",
+    autostart=false,
+    nics=[    <Fog::Libvirt::Compute::Nic
+      mac="52:54:00:d1:18:23",
+      id=nil,
+      type="network",
+      network="default",
+      bridge=nil,
+      model="virtio"
+    >],
+    volumes=[    <Fog::Libvirt::Compute::Volume
+      id=nil,
+      pool_name="1Download",
+      key=nil,
+      name="test.img",
+      path="/home/lzap/1Download/test.img",
+      capacity="10G",
+      allocation="1G",
+      owner=nil,
+      group=nil,
+      format_type="raw",
+      backing_volume=nil
+    >],
+    active=false,
+    boot_order=["hd", "cdrom", "network"],
+    display={:type=>"vnc", :port=>"-1", :listen=>"127.0.0.1"},
+    cpu={},
+    hugepages=false,
+    guest_agent=true,
+    virtio_rng={},
+    state="shutoff"
+  >
+```
+
 See [README.md](https://github.com/fog/fog-libvirt/blob/master/lib/fog/libvirt/models/compute/README.md).
 
 ## Contributing

data/fog-libvirt.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("shindo", "~> 0.3.4")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("yard")
-  s.add_development_dependency("mocha", "~> 1.13.0")
+  s.add_development_dependency("mocha", "~> 1.15.0")
 
   # Let's not ship dot files and gemfiles
   git_files = `git ls-files`.split("\n")

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

@@ -90,9 +90,13 @@ module Fog
           volumes.first.path if volumes and volumes.first
         end
 
-        def destroy(options={ :destroy_volumes => false})
+        def destroy(options={ :destroy_volumes => false, :flags => 0 })
           poweroff unless stopped?
-          service.vm_action(uuid, :undefine)
+          if options[:flags].zero?
+            service.vm_action(uuid, :undefine)
+          else
+            service.vm_action(uuid, :undefine, options[:flags])
+          end
           volumes.each { |vol| vol.destroy } if options[:destroy_volumes]
           true
         end
@@ -407,13 +411,11 @@ module Fog
           ip_address = nil
           nic = self.nics.find {|nic| nic.mac==mac}
           if !nic.nil?
-            service.networks.all.each do |net|
-              if net.name == nic.network
-                leases = net.dhcp_leases(mac, 0)
-                # Assume the lease expiring last is the current IP address
-                ip_address = leases.sort_by { |lse| lse["expirytime"] }.last["ipaddr"] if !leases.empty?
-                break
-              end
+            net = service.networks.all(:name => nic.network).first
+            if !net.nil?
+              leases = net.dhcp_leases(mac, 0)
+              # Assume the lease expiring last is the current IP address
+              ip_address = leases.sort_by { |lse| lse["expirytime"] }.last["ipaddr"] if !leases.empty?
             end
           end
 

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

@@ -20,8 +20,12 @@
           <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>

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

@@ -66,7 +66,7 @@ module Fog
         end
 
         def domain_to_attributes(dom)
-          states= %w(nostate running blocked paused shutting-down shutoff crashed)
+          states= %w(nostate running blocked paused shutting-down shutoff crashed pmsuspended)
 
           begin
             {

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

@@ -44,8 +44,8 @@ module Fog
       end
 
       class Mock
-        def list_networks(filters={ })
-          [ {
+        def list_networks(filter={ })
+          networks = [ {
               :uuid        => 'a29146ea-39b2-412d-8f53-239eef117a32',
               :name        => 'net1',
               :bridge_name => 'virbr0'
@@ -56,6 +56,16 @@ module Fog
               :bridge_name => 'virbr1'
             }
           ]
+          return networks if filter.empty?
+
+          case filter.keys.first
+            when :uuid
+              [networks.find(:uuid => filter[:uuid]).first]
+            when :name
+              [networks.find(:name => filter[:name]).first]
+            else
+              networks
+          end
         end
       end
     end

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

@@ -5,19 +5,22 @@ module Fog
         def list_pools(filter = { })
           data=[]
           if filter.key?(:name)
-            data << find_pool_by_name(filter[:name])
+            data << find_pool_by_name(filter[:name], filter[:include_inactive])
           elsif filter.key?(:uuid)
-            data << find_pool_by_uuid(filter[:uuid])
+            data << find_pool_by_uuid(filter[:uuid], filter[:include_inactive])
           else
             (client.list_storage_pools + client.list_defined_storage_pools).each do |name|
-              data << find_pool_by_name(name)
+              data << find_pool_by_name(name, filter[:include_inactive])
             end
           end
           data.compact
         end
 
         private
-        def pool_to_attributes(pool)
+
+        private_class_method def self.pool_to_attributes(pool, include_inactive = nil)
+          return nil unless pool.active? || include_inactive
+
           states=[:inactive, :building, :running, :degrated, :inaccessible]
           {
             :uuid           => pool.uuid,
@@ -27,19 +30,19 @@ module Fog
             :name           => pool.name,
             :allocation     => pool.info.allocation,
             :capacity       => pool.info.capacity,
-            :num_of_volumes => pool.num_of_volumes,
+            :num_of_volumes => pool.active? ? pool.num_of_volumes : nil,
             :state          => states[pool.info.state]
           }
         end
 
-        def find_pool_by_name name
-          pool_to_attributes(client.lookup_storage_pool_by_name(name))
+        def find_pool_by_name name, include_inactive
+          pool_to_attributes(client.lookup_storage_pool_by_name(name), include_inactive)
         rescue ::Libvirt::RetrieveError
           nil
         end
 
-        def find_pool_by_uuid uuid
-          pool_to_attributes(client.lookup_storage_pool_by_uuid(uuid))
+        def find_pool_by_uuid uuid, include_inactive
+          pool_to_attributes(client.lookup_storage_pool_by_uuid(uuid), include_inactive)
         rescue ::Libvirt::RetrieveError
           nil
         end

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

@@ -2,15 +2,15 @@ module Fog
   module Libvirt
     class Compute
       class Real
-        def vm_action(uuid, action)
+        def vm_action(uuid, action, *params)
           domain = client.lookup_domain_by_uuid(uuid)
-          domain.send(action)
+          domain.send(action, *params)
           true
         end
       end
 
       class Mock
-        def vm_action(uuid, action)
+        def vm_action(uuid, action, *params)
           true
         end
       end

data/lib/fog/libvirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Libvirt
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 end

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

@@ -0,0 +1,71 @@
+class FakePool < Fog::Model
+  # Fake pool object to allow exercising the internal parsing of pools
+  # returned by the client queries
+  identity :uuid
+
+  attribute :persistent
+  attribute :autostart
+  attribute :active
+  attribute :name
+  attribute :num_of_volumes
+  attr_reader :info
+
+  class FakeInfo < Fog::Model
+    attribute :allocation
+    attribute :capacity
+    attribute :state
+  end
+
+  def initialize(attributes = {})
+    @info = FakeInfo.new(attributes.dup.delete(:info))
+    super(attributes)
+  end
+
+  def active?
+    active
+  end
+
+  def autostart?
+    autostart
+  end
+
+  def persistent?
+    persistent
+  end
+end
+
+Shindo.tests("Fog::Compute[:libvirt] | list_pools request", 'libvirt') do
+
+  compute = Fog::Compute[:libvirt]
+
+  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 }
+  end
+
+  tests("Handle Inactive Pools") do
+    inactive_pool = {
+      :uuid => 'pool.uuid',
+      :persistent => true,
+      :autostart => true,
+      :active => false,
+      :name => 'inactive_pool1',
+      :info => {
+        :allocation => 123456789,
+        :capacity => 123456789,
+        :state => 2 # running
+      },
+      :num_of_volumes => 3
+    }
+
+    response = ::Fog::Libvirt::Compute::Real.send(:pool_to_attributes, FakePool.new(inactive_pool), true)
+
+    test("should be hash of attributes") { response.kind_of? Hash }
+
+    response = ::Fog::Libvirt::Compute::Real.send(:pool_to_attributes, FakePool.new(inactive_pool))
+
+    test("should be nil") { response.nil? }
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.15.0
 description: This library can be used as a module for 'fog' or as standalone libvirt
   provider.
 email: geemus@gmail.com
@@ -306,6 +306,7 @@ 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/list_pools_tests.rb
 - tests/libvirt/requests/compute/update_autostart_tests.rb
 - tests/libvirt/requests/compute/update_display.rb
 homepage: http://github.com/fog/fog-libvirt
@@ -328,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 2
 summary: Module for the 'fog' gem to support libvirt
@@ -354,5 +355,6 @@ 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/list_pools_tests.rb
 - tests/libvirt/requests/compute/update_autostart_tests.rb
 - tests/libvirt/requests/compute/update_display.rb