--- opennebula.py	2011-10-11 12:21:27.145945619 -0500
+++ opennebula.py	2011-10-10 19:24:32.072030755 -0500
@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-OpenNebula driver. Compatible with OpenNebula 1.4
+OpenNebula driver
 """
 
 from base64 import b64encode
@@ -168,7 +168,7 @@
 
     def _to_images(self, object):
         images = []
-        for element in object.findall("DISK"):
+        for element in object.findall("STORAGE"):
             image_id = element.attrib["href"].partition("/storage/")[2]
             image = self.connection.request(("/storage/%s" % (image_id))).object
             images.append(self._to_image(image))
@@ -178,7 +178,8 @@
     def _to_image(self, image):
         return NodeImage(id=image.findtext("ID"),
                          name=image.findtext("NAME"),
-                         driver=self.connection.driver)
+                         driver=self.connection.driver,
+                         extra={"description":image.findtext("DESCRIPTION"),"type":image.findtext("TYPE"),"size":image.findtext("SIZE")})
 
     def _to_nodes(self, object):
         computes = []