fog-libvirt 0.4.1 → 0.8.0

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

@@ -2,10 +2,10 @@ require 'fog/core/collection'
 require 'fog/libvirt/models/compute/server'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Servers < Fog::Collection
-        model Fog::Compute::Libvirt::Server
+        model Fog::Libvirt::Compute::Server
 
         def all(filter={})
           load(service.list_domains(filter))

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

@@ -1,6 +1,11 @@
 <domain type='<%= domain_type %>'>
   <name><%= name %></name>
   <memory><%= memory_size %></memory>
+<% if hugepages -%>
+  <memoryBacking>
+    <hugepages/>
+  </memoryBacking>
+<% end -%>
   <vcpu><%= cpus %></vcpu>
   <os>
     <type arch='<%= arch %>'><%= os_type %></type>
@@ -32,13 +37,48 @@
 <% end -%>
   <clock offset='utc'/>
   <devices>
+<% args = {}
+   if File.file?('/etc/foreman/ceph.conf')
+     File.readlines('/etc/foreman/ceph.conf').each do |line|
+       pair = line.strip.split("=")
+       key = pair[0]
+       value = pair[1]
+       args[key] = value
+     end
+   end
+%>
 <% volumes.each do |vol| -%>
+  <% if File.file?('/etc/foreman/ceph.conf') && vol.pool_name.include?(args["libvirt_ceph_pool"]) %>
+    <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") -%>
+        <secret type='ceph' uuid='<%= args["auth_uuid"] %>'/>
+       <% else -%>
+        <secret type='ceph' usage='<%= args["auth_usage"] %>'/>
+       <% end -%>
+      </auth>
+      <% 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'>
       <driver name='qemu' type='<%= vol.format_type %>'/>
       <source file='<%= vol.path %>'/>
       <%# we need to ensure a unique target dev -%>
       <target dev='vd<%= ('a'..'z').to_a[volumes.index(vol)] %>' bus='virtio'/>
     </disk>
+  <% end %>
 <% end -%>
 <% if iso_file -%>
     <disk type='file' device='cdrom'>
@@ -55,6 +95,21 @@
       <model type='<%= nic.model %>'/>
     </interface>
 <% end -%>
+<% if guest_agent -%>
+    <channel type='unix'>
+      <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/models/compute/templates/volume.xml.erb

@@ -5,8 +5,8 @@
         <target>
           <format type="<%= format_type %>"/>
           <permissions>
-            <owner>0</owner>
-            <group>0</group>
+            <owner><%= owner %></owner>
+            <group><%= group %></group>
             <mode>0744</mode>
             <label>virt_image_t</label>
           </permissions>
@@ -16,8 +16,8 @@
           <path><%= backing_volume.path %></path>
           <format type="<%= backing_volume.format_type %>"/>
           <permissions>
-            <owner>0</owner>
-            <group>0</group>
+            <owner><%= owner %></owner>
+            <group><%= group %></group>
             <mode>0744</mode>
             <label>virt_image_t</label>
           </permissions>

data/lib/fog/libvirt/models/compute/util/uri.rb

@@ -2,8 +2,8 @@ require 'uri'
 require 'cgi'
 
 module Fog
-  module Compute
-    module LibvirtUtil
+  module Libvirt
+    module Util
       class URI
         attr_reader :uri
 

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

@@ -4,8 +4,8 @@ require 'ostruct'
 require 'securerandom'
 
 module Fog
-  module Compute
-    module LibvirtUtil
+  module Libvirt
+    module Util
       def xml_element(xml, path, attribute=nil)
         xml = Nokogiri::XML(xml)
         attribute.nil? ? (xml/path).first.text : (xml/path).first[attribute.to_sym]

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

@@ -2,11 +2,11 @@ require 'fog/core/model'
 require 'fog/libvirt/models/compute/util/util'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Volume < Fog::Model
         attr_reader :xml
-        include Fog::Compute::LibvirtUtil
+        include Fog::Libvirt::Util
 
         identity :id, :aliases => 'key'
 
@@ -16,6 +16,8 @@ module Fog
         attribute :path
         attribute :capacity
         attribute :allocation
+        attribute :owner
+        attribute :group
         attribute :format_type
         attribute :backing_volume
 
@@ -106,18 +108,18 @@ module Fog
             :name        => randomized_name,
             :capacity    => "10G",
             :allocation  => "1G",
+            :owner       => "0",
+            :group       => "0",
           }
         end
 
         def split_size_unit(text)
-          if text.kind_of? Integer
-            # if text is an integer, match will fail
-            size    = text
-            unit    = 'G'
-          else
-            matcher = text.match(/(\d+)(.+)/)
+          if (text.kind_of? String) && (matcher = text.match(/(\d+)(.+)/))
             size    = matcher[1]
             unit    = matcher[2]
+          else
+            size    = text.to_i
+            unit    = "G"
           end
           [size, unit]
         end

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

@@ -2,10 +2,10 @@ require 'fog/core/collection'
 require 'fog/libvirt/models/compute/volume'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Volumes < Fog::Collection
-        model Fog::Compute::Libvirt::Volume
+        model Fog::Libvirt::Compute::Volume
 
         def all(filter = {})
           load(service.list_volumes(filter))

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def clone_volume (pool_name, xml, name)
           vol = client.lookup_storage_pool_by_name(pool_name).lookup_volume_by_name(name)
@@ -10,7 +10,7 @@ module Fog
 
       class Mock
         def clone_volume(pool_name, xml, name)
-          Fog::Compute::Libvirt::Volume.new({:pool_name => pool_name, :xml => xml})
+          Fog::Libvirt::Compute::Volume.new({:pool_name => pool_name, :xml => xml})
         end
       end
     end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def create_domain(xml)
           client.create_domain_xml(xml)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def create_volume(pool_name, xml)
           client.lookup_storage_pool_by_name(pool_name).create_vol_xml(xml)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def define_domain(xml)
           client.define_domain_xml(xml)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def define_pool(xml)
           client.define_storage_pool_xml(xml)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         #shutdown the interface
         def destroy_interface(uuid)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def destroy_network(uuid)
           client.lookup_network_by_uuid(uuid).destroy

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

@@ -1,8 +1,8 @@
 require 'socket'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def dhcp_leases(uuid, mac, flags = 0)
           client.lookup_network_by_uuid(uuid).dhcp_leases(mac, flags)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def get_node_info
           node_hash = Hash.new

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

@@ -0,0 +1,18 @@
+
+module Fog
+  module Libvirt
+    class Compute
+      class Real
+        def libversion()
+          client.libversion
+        end
+      end
+
+      class Mock
+        def libversion()
+          return 1002009
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def list_domains(filter = { })
           data=[]
@@ -39,7 +39,13 @@ module Fog
         end
 
         def domain_volumes xml
-          xml_elements(xml, "domain/devices/disk/source", "file")
+          vols_by_file = xml_elements(xml, "domain/devices/disk/source", "file")
+          vols_by_name = xml_elements(xml, "domain/devices/disk/source", "name")
+          vols = []
+          vols_by_file.zip(vols_by_name).each do |by_file,by_name|
+            vols.push(by_file.nil? ? by_name : by_file)
+          end
+          vols
         end
 
         def boot_order xml

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def list_interfaces(filter = { })
           data=[]

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def list_networks(filter = { })
           data=[]
@@ -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_pool_volumes.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def list_pool_volumes(uuid)
           pool = client.lookup_storage_pool_by_uuid uuid

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def list_pools(filter = { })
           data=[]

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Real
         def list_volumes(filter = { })
           data = []
@@ -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,