diff --git a/src/datastore_mad/remotes/vmfs/cp b/src/datastore_mad/remotes/vmfs/cp index f45e405790..67e0a483cc 100755 --- a/src/datastore_mad/remotes/vmfs/cp +++ b/src/datastore_mad/remotes/vmfs/cp @@ -62,6 +62,7 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \ /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \ /DS_DRIVER_ACTION_DATA/IMAGE/ID \ + /DS_DRIVER_ACTION_DATA/IMAGE/TYPE \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW) @@ -77,8 +78,9 @@ SRC="${XPATH_ELEMENTS[8]}" MD5="${XPATH_ELEMENTS[9]}" SHA1="${XPATH_ELEMENTS[10]}" IMAGE_ID="${XPATH_ELEMENTS[11]}" -NO_DECOMPRESS="${XPATH_ELEMENTS[12]}" -LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[13]}" +IMAGE_TYPE="${XPATH_ELEMENTS[12]}" +NO_DECOMPRESS="${XPATH_ELEMENTS[13]}" +LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[14]}" FE_DST=`generate_image_path` DST_FOLDER=`basename $FE_DST` @@ -92,7 +94,9 @@ set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK" vmfs_set_up -vmfs_create_remote_path $DS_ID +if ! is_cdrom; then + vmfs_create_remote_path $DS_ID +fi # ------------ Prepare for a possible download in the front-end ------------- @@ -124,7 +128,7 @@ http://*|https://* ) log "Copying local disk folder $SRC to the image repository" - if [ ! -d $SRC ]; then + if [ ! -d $SRC -a ! is_cdrom ]; then exec_and_log "$COPY_COMMAND" "Error copying $SRC to $TMP_DIR/$DST_FOLDER" SRC="$TMP_DIR/$DST_FOLDER" fi @@ -132,7 +136,7 @@ http://*|https://* ) esac # Rename the disk filename to disk.vmdk (warning: it does so in SRC) -if [ ! -f $SRC/disk.vmdk ]; then +if [ -d "$SRC" -a ! -f "$SRC/disk.vmdk" ]; then BASE_DISK_FILE=`ls $SRC | grep '\.vmdk$' | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'` exec_and_log "mv -f $SRC/$BASE_DISK_FILE $SRC/disk.vmdk" \ @@ -141,14 +145,24 @@ fi # Make the final hop, front-end -> VMFS Datastore if [ "$USE_SSH" == "yes" ]; then - exec_and_log "$SCP -r $SRC/* $DST_HOST:$DST" "Error copying $SRC to $DST through SCP" + if ! is_cdrom; then + exec_and_log "$SCP -r $SRC/* $DST_HOST:$DST" "Error copying $SRC to $DST through SCP" + else + exec_and_log "$SCP $SRC $DST_HOST:$DST" "Error copying $SRC to $DST through SCP" + fi else - cd $SRC - for file in $(find . -type f); do - FNAME=$(basename $file) - exec_and_log "vifs $VI_PARAMS -p $file [$DS_ID]$DST_FOLDER/$FNAME" \ - "Cannot upload $file to $DST/$FNAME on $DST_HOST" - done + if ! is_cdrom; then + cd $SRC + for file in $(find . -type f); do + FNAME=$(basename $file) + exec_and_log "vifs $VI_PARAMS -p $file [$DS_ID]$DST_FOLDER/$FNAME" \ + "Cannot upload $file to $DST/$FNAME on $DST_HOST" + done + else # Type CDROM + FILE_TO_REGISTER=$(basename $DST) + exec_and_log "vifs $VI_PARAMS -p $SRC [$DS_ID]$FILE_TO_REGISTER" \ + "Cannot upload $SRC to $DST on $DST_HOST" + fi fi if [ -d "$TMP_DIR/$DST_FOLDER" -a -n "$DST_FOLDER" ]; then diff --git a/src/tm_mad/tm_common.sh b/src/tm_mad/tm_common.sh index 6e7ff13226..58443e4f1b 100644 --- a/src/tm_mad/tm_common.sh +++ b/src/tm_mad/tm_common.sh @@ -101,3 +101,8 @@ function get_tm_use_ssh { echo $TM_USE_SSH } + +# Checks wether $IMAGE_TYPE is CDROM +function is_cdrom { + [ "$IMAGE_TYPE" = "1" ] +} diff --git a/src/tm_mad/vmfs/clone b/src/tm_mad/vmfs/clone index 07439604da..1f5be040f3 100755 --- a/src/tm_mad/vmfs/clone +++ b/src/tm_mad/vmfs/clone @@ -54,6 +54,20 @@ IMAGE_DS_NAME=`basename $(dirname $SRC_PATH)` SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))` USE_SSH=$(get_tm_use_ssh $IMAGE_DS_NAME) +# Let's check if it is a CDROM +DISK_ID=$(echo "$DST_PATH" | $AWK -F. '{print $NF}') +XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin" +DRIVER_PATH=$(dirname $0) + +unset i XPATH_ELEMENTS + +while IFS= read -r -d '' element; do + XPATH_ELEMENTS[i++]="$element" +done < <(onevm show -x $VMID| $XPATH \ + /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE ) + +DISK_TYPE="${XPATH_ELEMENTS[0]}" + #------------------------------------------------------------------------------- # Set up datastore #------------------------------------------------------------------------------- @@ -64,10 +78,12 @@ vmfs_set_up # Create remote folder #------------------------------------------------------------------------------- -if [ "$USE_SSH" == "yes" ]; then - ssh_make_path $DST_HOST $DST_PATH -else - vmfs_create_double_path $SYSTEM_DS_NAME $VMID $DST_FOLDER +if [ "$DISK_TYPE" != "CDROM"]; then + if [ "$USE_SSH" == "yes" ]; then + ssh_make_path $DST_HOST $DST_PATH + else + vmfs_create_double_path $SYSTEM_DS_NAME $VMID $DST_FOLDER + fi fi #------------------------------------------------------------------------------- @@ -86,23 +102,36 @@ if which sudo > /dev/null; then SUDO_CMD="sudo " fi -\$SUDO_CMD $VMKFSTOOLS -U $DST_PATH/disk.vmdk -\$SUDO rm $DST_PATH/* -\$SUDO_CMD $VMKFSTOOLS -i $SRC_PATH/disk.vmdk -d thin $DST_PATH/disk.vmdk +if [ "$DISK_TYPE" != "CDROM" ]; then + \$SUDO_CMD $VMKFSTOOLS -U $DST_PATH/disk.vmdk + \$SUDO rm $DST_PATH/* + \$SUDO_CMD $VMKFSTOOLS -i $SRC_PATH/disk.vmdk -d thin $DST_PATH/disk.vmdk +else + \$SUDO rm $DST_PATH + \$SUDO cp $SRC_PATH $DST_PATH + \$SUDO ln -s $DST_PATH $DST_PATH.iso +fi + EOF ) ssh_exec_and_log $DST_HOST "$CLONESCRIPT" "Error cloning $SRC to $DST" else - $VMKFSTOOLS $VI_PARAMS -U [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk &> /dev/null + if [ "$DISK_TYPE" != "CDROM"]; then + $VMKFSTOOLS $VI_PARAMS -U [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk &> /dev/null - # Erase in case that vmkfstool didn't recognize the disk - FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"` - for file in $FILES_TO_ERASE; do - vifs $VI_PARAMS --force --rm [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/$file - done + # Erase in case that vmkfstool didn't recognize the disk + FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"` + for file in $FILES_TO_ERASE; do + vifs $VI_PARAMS --force --rm [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/$file + done - exec_and_log "$VMKFSTOOLS $VI_PARAMS -i [$IMAGE_DS_NAME]$SRC_FOLDER/disk.vmdk -d thin [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \ - "Error cloning $SRC to $DST" + exec_and_log "$VMKFSTOOLS $VI_PARAMS -i [$IMAGE_DS_NAME]$SRC_FOLDER/disk.vmdk -d thin [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \ + "Error cloning $SRC to $DST" + else + vifs $VI_PARAMS --force --rm [$SYSTEM_DS_NAME]$VMID/$DST_PATH &> /dev/null + exec_and_log "vifs $VI_PARAMS -p $SRC_PATH [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER.iso" \ + "Cannot upload $SRC_PATH to [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER.iso on $DST_HOST" + fi fi exit 0 diff --git a/src/tm_mad/vmfs/ln b/src/tm_mad/vmfs/ln index d2cb48d4d9..c558a34bf2 100755 --- a/src/tm_mad/vmfs/ln +++ b/src/tm_mad/vmfs/ln @@ -59,9 +59,25 @@ USE_SSH=$(get_tm_use_ssh $DSID) #------------------------------------------------------------------------------- if [ "$USE_SSH" == "yes" ]; then - ssh_make_path $DST_HOST $DST_PATH - log "Link all files in $SRC_PATH to $DST_PATH" + # Let's check if it is a CDROM + DISK_ID=$(echo "$DST_PATH" | $AWK -F. '{print $NF}') + XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin" + DRIVER_PATH=$(dirname $0) + + unset i XPATH_ELEMENTS + + while IFS= read -r -d '' element; do + XPATH_ELEMENTS[i++]="$element" + done < <(onevm show -x $VMID| $XPATH \ + /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE ) + + DISK_TYPE="${XPATH_ELEMENTS[0]}" + + if [ "$DISK_TYPE" != "CDROM"]; then + ssh_make_path $DST_HOST $DST_PATH + + log "Link all files in $SRC_PATH to $DST_PATH" LINK_SCRIPT=$(cat <