From 01324189a62e5e67ef8bb07de4d13d32c859fe12 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 23 May 2016 19:05:13 +0200 Subject: [PATCH] Bug #4431: Add datastore suffix to image name in vCenter image import --- src/cli/oneimage | 3 ++- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cli/oneimage b/src/cli/oneimage index db9718e0bf..c9504083d1 100755 --- a/src/cli/oneimage +++ b/src/cli/oneimage @@ -105,7 +105,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do oneimage create -d 1 --name ubuntu --path /tmp/ubuntu.qcow2 \\ --prefix sd --type OS --driver qcow2 \\ - --description "A OS plain installation" + --description "A OS plain installation \\ + --persistent" - a datablock image of 400MB: diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 3c09c8956c..0585ae5e7e 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -684,12 +684,12 @@ class VIClient if !ipool["IMAGE[NAME=\"#{image_name}\"]"] img_templates << { - :name => "#{image_name}", + :name => "#{image_name} - #{ds_name}", :path => image_path, :size => (image.fileSize / 1024).to_s, :type => image.class.to_s, :dsid => ds_id, - :one => "NAME=\"#{image_name}\"\n"\ + :one => "NAME=\"#{image_name} - #{ds_name}\"\n"\ "PATH=\"vcenter://#{image_path}\"\n"\ "PERSISTENT=\"YES\"\n"\ }