shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-27 10:50:10 +03:00
Code Releases Wiki Activity

feature #4217: Fixes minor bugs

Browse Source
This commit is contained in:
Ruben S. Montero 2015-12-28 17:43:05 +01:00
parent 49b9de94f5
commit 66c135e346
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/market_mad/one_market.rb
View File

@ -47,7 +47,8 @@ class MarketPlaceDriver < OpenNebulaDriver
:import => "IMPORT",
:delete => "DELETE",
:log => "LOG",
:monitor => "MONITOR"
:monitor => "MONITOR",
:export => "EXPORT" #For Datastore export action
}
# XPATHs for driver messages

7
src/oca/ruby/opennebula/marketplaceapp.rb
View File

@ -197,6 +197,9 @@ module OpenNebula
return rc if OpenNebula.is_error?(rc)
image_id = image.id
vmtpl_id = -1
if !self['TEMPLATE/VMTEMPLATE64'].nil?
tmpl=Base64::decode64(self['TEMPLATE/VMTEMPLATE64'])
@ -207,9 +210,11 @@ module OpenNebula
rc = vmtpl.allocate(tmpl)
return rc if OpenNebula.is_error?(rc)
vmtpl_id = vmtpl.id
end
return { :image => [image.id], :vmtemplate => [vmtpl.id] }
return { :image => [image_id], :vmtemplate => [vmtpl_id] }
else
return Error.new("App type #{app.type_str} not supported")
end