Merge branch 'feature-417'

src/cloud/common/CloudServer.rb

@@ -113,10 +113,11 @@ class CloudServer
     # metadata:: Additional metadata for the file
     # [return] _Image_ Newly created image object
     def add_image(image, file=nil)
+        template = image.to_one_template
+        
         if file
             if file[:tempfile]
                 file_path = file[:tempfile].path
-                template = image.to_one_template
                 template << "\nPATH = #{file_path}"
             else
                 error_msg = "Image not present, aborting."
@@ -127,7 +128,7 @@ class CloudServer
 
         rc = @img_repo.create(image, template)
 
-        file[:tempfile].unlink
+        file[:tempfile].unlink if file
 
         if OpenNebula.is_error?(rc)
            return rc

src/cloud/occi/lib/ImageOCCI.rb

@@ -32,6 +32,9 @@ class ImageOCCI < Image
             <% if  size != nil %>
             <SIZE><%= size %></SIZE>
             <% end  %>
+            <% if  fstype != nil %>
+            <FSTYPE><%= fstype %></FSTYPE>
+            <% end  %>
         </STORAGE>
     }
 
@@ -70,7 +73,10 @@ class ImageOCCI < Image
         begin
             if self['SOURCE'] != nil and File.exists?(self['SOURCE'])
                 size = File.stat(self['SOURCE']).size
+                size = size / 1024
             end
+
+            fstype = self['TEMPLATE/FSTYPE'] if self['TEMPLATE/FSTYPE']
         rescue Exception => e
             error = OpenNebula::Error.new(e.message)
             return error

src/oca/ruby/OpenNebula/ImageRepository.rb

@@ -1,5 +1,6 @@
 require 'OpenNebula/Image'
 require 'fileutils'
+require 'CommandManager'
 
 module OpenNebula