From d3e2c0a615f42f215047f9e4c1027e75bb264d4e Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 24 Apr 2013 13:12:07 +0200 Subject: [PATCH] Bug #1911: Now vmfs datstore drivers can clone CDROMs --- src/datastore_mad/remotes/vmfs/clone | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/datastore_mad/remotes/vmfs/clone b/src/datastore_mad/remotes/vmfs/clone index fbe6f190c3..36c945d1b1 100755 --- a/src/datastore_mad/remotes/vmfs/clone +++ b/src/datastore_mad/remotes/vmfs/clone @@ -54,7 +54,8 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/DS_USE_SSH \ /DS_DRIVER_ACTION_DATA/DATASTORE/ID \ /DS_DRIVER_ACTION_DATA/IMAGE/PATH \ - /DS_DRIVER_ACTION_DATA/IMAGE/ID) + /DS_DRIVER_ACTION_DATA/IMAGE/ID \ + /DS_DRIVER_ACTION_DATA/IMAGE/TYPE) BASE_PATH="${XPATH_ELEMENTS[0]}" UMASK="${XPATH_ELEMENTS[1]}" @@ -63,6 +64,7 @@ USE_SSH="${XPATH_ELEMENTS[3]:-$DS_USE_SSH}" DS_ID="${XPATH_ELEMENTS[4]}" SRC="${XPATH_ELEMENTS[5]}" IMAGE_ID="${XPATH_ELEMENTS[6]}" +IMAGE_TYPE="${XPATH_ELEMENTS[7]}" SRC_FOLDER=`basename $SRC` DST=`generate_image_path` @@ -80,8 +82,12 @@ vmfs_set_up log "Copying local image $SRC to the image repository" if [ "$USE_SSH" == "yes" ]; then - ssh_make_path $DST_HOST /vmfs/volumes/$DS_ID/$DST_FOLDER - ssh_exec_and_log $DST_HOST "$VMKFSTOOLS $VI_PARAMS -i /vmfs/volumes/$DS_ID/$SRC_FOLDER/disk.vmdk /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk" "Error copying /vmfs/volumes/$DS_ID/$SRC_FOLDER/disk.vmdk to /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk" + if ! is_cdrom; then + ssh_make_path $DST_HOST /vmfs/volumes/$DS_ID/$DST_FOLDER + ssh_exec_and_log $DST_HOST "$VMKFSTOOLS $VI_PARAMS -i /vmfs/volumes/$DS_ID/$SRC_FOLDER/disk.vmdk /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk" "Error copying /vmfs/volumes/$DS_ID/$SRC_FOLDER/disk.vmdk to /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk" + else + ssh_exec_and_log $DST_HOST "cp /vmfs/volumes/$DS_ID/$SRC_FOLDER /vmfs/volumes/$DS_ID/$DST_FOLDER" "Error copying /vmfs/volumes/$DS_ID/$SRC_FOLDER to /vmfs/volumes/$DS_ID/$DST_FOLDER in $DST_HOST" + fi else exec_and_log "vifs $VI_PARAMS --copy [$DS_ID]$SRC_FOLDER [$DS_ID]$DST_FOLDER" \ "Error copying $SRC to $DST"