Merge pull request fog#1008 from ohadlevy/master

[libvirt] minor updates
dizz · Jun 27, 2012 · 2f226ad · 2f226ad
2 parents ff80609 + fe0f3dd
commit 2f226ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/fog/libvirt/requests/compute/create_volume.rb b/lib/fog/libvirt/requests/compute/create_volume.rb
@@ -8,7 +8,7 @@ def create_volume(pool_name, xml)
       end
 
       class Mock
-        def create_volume(xml)
+        def create_volume(pool_name, xml)
 
         end
       end

diff --git a/lib/fog/libvirt/requests/compute/list_volumes.rb b/lib/fog/libvirt/requests/compute/list_volumes.rb
@@ -20,7 +20,7 @@ def list_volumes(filter = { })
 
         def volume_to_attributes(vol)
 
-          format_type = xml_element(vol.xml_desc, "/volume/target/format", "type")
+          format_type = xml_element(vol.xml_desc, "/volume/target/format", "type") rescue nil # not all volumes have types, e.g. LVM
           return nil if format_type == "dir"
 
           {