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

feature #336: ImageRepository does not try to copy if SOURCE is present in the template

Browse Source
This commit is contained in:
Daniel Molina 2010-09-09 12:44:12 +02:00 committed by Ruben S. Montero
parent fd899f2a06
commit ce1bd84153
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cli/oneimage
View File

@ -266,12 +266,6 @@ EOT
table=ShowTable.new(ShowTableImage)
table.print_help
end
def special_options(opts, options)
opts.on_tail("-n", "--no-cp", "Do not copy the source") do |o|
options[:no_cp]=true
end
end
end
@ -330,7 +324,7 @@ when "register", "create", "add"
image = OpenNebula::Image.new(OpenNebula::Image.build_xml, get_one_client)
result = img_repo.create(image, template, !ops[:no_cp])
result = img_repo.create(image, template)
if is_successful?(result)
puts "ID: " + image.id.to_s if ops[:verbose]
end

28
src/oca/ruby/OpenNebula/ImageRepository.rb
View File

@ -4,7 +4,7 @@ require 'fileutils'
module OpenNebula
class ImageRepository
def create(image, template, copy=true)
def create(image, template)
if image.nil?
error_msg = "Image could not be found, aborting."
return OpenNebula::Error.new(error_msg)
@ -21,18 +21,16 @@ module OpenNebula
# ------ Copy the Image file ------
image.info
if image['TEMPLATE/PATH']
if copy
# --- CDROM, DATABLOCK or OS based on a PATH ---
file_path = image['TEMPLATE/PATH']
if image['TEMPLATE/PATH'] and image['TEMPLATE/SOURCE'].nil?
# --- CDROM, DATABLOCK or OS based on a PATH ---
file_path = image['TEMPLATE/PATH']
if !File.exists?(file_path)
error_msg = "Image file could not be found, aborting."
return OpenNebula::Error.new(error_msg)
end
result = copy(file_path, image['SOURCE'])
if !File.exists?(file_path)
error_msg = "Image file could not be found, aborting."
return OpenNebula::Error.new(error_msg)
end
result = copy(file_path, image['SOURCE'])
elsif image['TEMPLATE/SIZE'] and image['TEMPLATE/FSTYPE'] and \
image['TEMPLATE/TYPE'] == 'DATABLOCK'
# --- Empty DATABLOCK ---
@ -41,8 +39,12 @@ module OpenNebula
if !OpenNebula.is_error?(result)
result = mkfs(image['TEMPLATE/FSTYPE'], image['SOURCE'])
end
else
error_msg = "Image not present, aborting."
elsif image['TEMPLATE/PATH'].nil? and image['TEMPLATE/SOURCE'].nil?
error_msg = "Image path not present, aborting."
result = OpenNebula::Error.new(error_msg)
elsif image['TEMPLATE/PATH'] and image['TEMPLATE/SOURCE']
error_msg = "Template malformed, PATH and SOURCE are" <<
" mutuallly exclusive"
result = OpenNebula::Error.new(error_msg)
end