From 9f25bb059b80643767cfe7d6e72761ff0076b268 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Wed, 4 Sep 2024 01:21:34 +0300
Subject: [PATCH] Use just IMAGE_PREFIX, not IMAGE_PREFIX+"one"

---
 opennebula/remotes/datastore/vitastor/clone | 5 ++---
 opennebula/remotes/datastore/vitastor/cp    | 6 +++---
 opennebula/remotes/datastore/vitastor/mkfs  | 7 ++-----
 opennebula/remotes/tm/vitastor/cpds         | 2 +-
 opennebula/remotes/tm/vitastor/delete       | 8 ++++----
 opennebula/remotes/tm/vitastor/mkimage      | 4 ++--
 opennebula/remotes/tm/vitastor/resize       | 4 ++--
 opennebula/remotes/vmm/kvm/restore.vitastor | 4 ++--
 opennebula/remotes/vmm/kvm/save.vitastor    | 4 ++--
 opennebula/vitastor-imageds.conf            | 2 +-
 10 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/opennebula/remotes/datastore/vitastor/clone b/opennebula/remotes/datastore/vitastor/clone
index f6b3cecd..01e5fe85 100755
--- a/opennebula/remotes/datastore/vitastor/clone
+++ b/opennebula/remotes/datastore/vitastor/clone
@@ -43,7 +43,7 @@ unset i
 BASE_PATH="${XPATH_ELEMENTS[i++]}"
 BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
 POOL_NAME="${XPATH_ELEMENTS[i++]}"
-IMAGE_PREFIX="${XPATH_ELEMENTS[i++]}"
+IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
 SRC="${XPATH_ELEMENTS[i++]}"
 SIZE="${XPATH_ELEMENTS[i++]}"
 VITASTOR_CONF="${XPATH_ELEMENTS[i++]}"
@@ -65,12 +65,11 @@ fi
 
 SAFE_DIRS=""
 
-DST="${IMAGE_PREFIX}one-${ID}"
+DST="${IMAGE_PREFIX}-${ID}"
 
 ssh_exec_and_log "$DST_HOST" "$CLI create --parent $SRC $DST" \
     "Error during $CLI create --parent $SRC $DST in $DST_HOST"
 
-# FIXME: Is it really required?
 ssh_exec_and_log "$DST_HOST" "$CLI flatten $DST" \
     "Error during $CLI create flatten $DST in $DST_HOST"
 
diff --git a/opennebula/remotes/datastore/vitastor/cp b/opennebula/remotes/datastore/vitastor/cp
index e756058a..ed60ea6b 100755
--- a/opennebula/remotes/datastore/vitastor/cp
+++ b/opennebula/remotes/datastore/vitastor/cp
@@ -57,8 +57,8 @@ RESTRICTED_DIRS="${XPATH_ELEMENTS[i++]}"
 SAFE_DIRS="${XPATH_ELEMENTS[i++]}"
 BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
 POOL_NAME="${XPATH_ELEMENTS[i++]}"
-IMAGE_PREFIX="${XPATH_ELEMENTS[i++]}"
-STAGING_DIR="${XPATH_ELEMENTS[i++]:-$STAGING_DIR}"
+IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
+STAGING_DIR="${XPATH_ELEMENTS[i++]:-/var/tmp}"
 SRC="${XPATH_ELEMENTS[i++]}"
 SIZE="${XPATH_ELEMENTS[i++]}"
 MD5="${XPATH_ELEMENTS[i++]}"
@@ -89,7 +89,7 @@ set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
 IMAGE_HASH=`generate_image_hash`
 TMP_DST="$STAGING_DIR/$IMAGE_HASH"
 
-DST="${IMAGE_PREFIX}one-${ID}"
+DST="${IMAGE_PREFIX}-${ID}"
 
 DOWNLOADER_ARGS=`set_downloader_args "$MD5" "$SHA1" "$NO_DECOMPRESS" "$LIMIT_TRANSFER_BW" "$SRC" -`
 
diff --git a/opennebula/remotes/datastore/vitastor/mkfs b/opennebula/remotes/datastore/vitastor/mkfs
index cf63abc7..66ff4c18 100755
--- a/opennebula/remotes/datastore/vitastor/mkfs
+++ b/opennebula/remotes/datastore/vitastor/mkfs
@@ -38,7 +38,6 @@ done < <($XPATH \
     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX \
-    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/STAGING_DIR \
     /DS_DRIVER_ACTION_DATA/IMAGE/FORMAT \
     /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
     /DS_DRIVER_ACTION_DATA/IMAGE/FS \
@@ -51,8 +50,7 @@ RESTRICTED_DIRS="${XPATH_ELEMENTS[i++]}"
 SAFE_DIRS="${XPATH_ELEMENTS[i++]}"
 BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
 POOL_NAME="${XPATH_ELEMENTS[i++]}"
-IMAGE_PREFIX="${XPATH_ELEMENTS[i++]}"
-STAGING_DIR="${XPATH_ELEMENTS[i++]:-$STAGING_DIR}"
+IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
 FORMAT="${XPATH_ELEMENTS[i++]}"
 SIZE="${XPATH_ELEMENTS[i++]}"
 FS="${XPATH_ELEMENTS[i++]}"
@@ -75,7 +73,7 @@ fi
 
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
 
-IMAGE_NAME="${IMAGE_PREFIX}one-${ID}"
+IMAGE_NAME="${IMAGE_PREFIX}-${ID}"
 
 # ------------ Image to save_as disk, no need to create a new image ------------
 
@@ -109,7 +107,6 @@ if [ ! -z $FS ]; then
     set -e -o pipefail
 
     IMAGE_HASH=`generate_image_hash`
-    TMP_DST="$STAGING_DIR/$IMAGE_HASH"
     FS_OPTS=$(eval $(echo "echo \$FS_OPTS_$FS"))
 
     MKFS_CMD=`mkfs_command '$NBD' raw "$SIZE" "$SUPPORTED_FS" "$FS" "$FS_OPTS" | grep -v $QEMU_IMG`
diff --git a/opennebula/remotes/tm/vitastor/cpds b/opennebula/remotes/tm/vitastor/cpds
index 9ceb7b66..f0822d40 100755
--- a/opennebula/remotes/tm/vitastor/cpds
+++ b/opennebula/remotes/tm/vitastor/cpds
@@ -52,7 +52,7 @@ unset i j XPATH_ELEMENTS
 
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
-done < <(onevm show -x $VM_ID| $XPATH \
+done < <(onevm show -x $VM_ID | $XPATH \
     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/VITASTOR_CONF \
diff --git a/opennebula/remotes/tm/vitastor/delete b/opennebula/remotes/tm/vitastor/delete
index 3dc76c1e..415720d0 100755
--- a/opennebula/remotes/tm/vitastor/delete
+++ b/opennebula/remotes/tm/vitastor/delete
@@ -57,7 +57,7 @@ if [ `is_disk $DST_PATH` -eq 0 ]; then
     SRC="${XPATH_ELEMENTS[j++]}"
     CLONE="${XPATH_ELEMENTS[j++]}"
     VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
-    IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}"
+    IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
     POOL_NAME="${XPATH_ELEMENTS[j++]}"
 
     CLI=vitastor-cli
@@ -65,7 +65,7 @@ if [ `is_disk $DST_PATH` -eq 0 ]; then
         CLI="$CLI --config_path ${VITASTOR_CONF}"
     fi
 
-    SRC_CHECKPOINT="${IMAGE_PREFIX}one-sys-${VM_ID}-checkpoint"
+    SRC_CHECKPOINT="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
 
     ssh_exec_and_log "$DST_HOST" "$CLI rm $SRC_CHECKPOINT 2>/dev/null || exit 0" \
         "Error deleting $SRC_CHECKPOINT in $DST_HOST"
@@ -95,7 +95,7 @@ done < <(onevm show -x $VM_ID | $XPATH \
 SRC="${XPATH_ELEMENTS[j++]}"
 CLONE="${XPATH_ELEMENTS[j++]}"
 VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
-IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}"
+IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
 POOL_NAME="${XPATH_ELEMENTS[j++]}"
 
 if is_undeployed "$VM_ID" "$DST_HOST"; then
@@ -124,7 +124,7 @@ if [ -n "$SRC" ]; then
     SRC_IMAGE="${SRC}-${VM_ID}-${DISK_ID}"
 else
     # volatile
-    SRC_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-${DISK_ID}"
+    SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-${DISK_ID}"
 fi
 
 # Delete the image
diff --git a/opennebula/remotes/tm/vitastor/mkimage b/opennebula/remotes/tm/vitastor/mkimage
index 13e59423..7fd34abb 100755
--- a/opennebula/remotes/tm/vitastor/mkimage
+++ b/opennebula/remotes/tm/vitastor/mkimage
@@ -64,7 +64,7 @@ done < <(onevm show -x $VMID | $XPATH \
 
 VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
 POOL_NAME="${XPATH_ELEMENTS[j++]}"
-IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}"
+IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
 FS="${XPATH_ELEMENTS[j++]}"
 
 CLI=
@@ -74,7 +74,7 @@ if [ -n "$VITASTOR_CONF" ]; then
     QEMU_ARG=":config_path=${VITASTOR_CONF}"
 fi
 
-IMAGE_NAME="${IMAGE_PREFIX}one-sys-${VMID}-${DISK_ID}"
+IMAGE_NAME="${IMAGE_PREFIX}-sys-${VMID}-${DISK_ID}"
 
 ssh_make_path $DST_HOST $DST_DIR
 
diff --git a/opennebula/remotes/tm/vitastor/resize b/opennebula/remotes/tm/vitastor/resize
index f7a9d01a..439c54ca 100755
--- a/opennebula/remotes/tm/vitastor/resize
+++ b/opennebula/remotes/tm/vitastor/resize
@@ -51,7 +51,7 @@ done < <(onevm show -x $VM_ID | $XPATH \
 
 SRC_IMAGE="${XPATH_ELEMENTS[j++]}"
 VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
-IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}"
+IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
 PERSISTENT="${XPATH_ELEMENTS[j++]}"
 
 if [ -n "${SRC_IMAGE}" ]; then
@@ -59,7 +59,7 @@ if [ -n "${SRC_IMAGE}" ]; then
         SRC_IMAGE="${SRC_IMAGE}-${VM_ID}-${DISK_ID}"
     fi
 else
-    SRC_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-${DISK_ID}"
+    SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-${DISK_ID}"
 fi
 
 #-------------------------------------------------------------------------------
diff --git a/opennebula/remotes/vmm/kvm/restore.vitastor b/opennebula/remotes/vmm/kvm/restore.vitastor
index 44708f19..97c9baec 100755
--- a/opennebula/remotes/vmm/kvm/restore.vitastor
+++ b/opennebula/remotes/vmm/kvm/restore.vitastor
@@ -24,14 +24,14 @@ done < <($XPATH \
     /VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX)
 
 VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
-IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}"
+IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
 
 CLI=vitastor-cli
 if [ -n "$VITASTOR_CONF" ]; then
     CLI="$CLI --config_path $VITASTOR_CONF"
 fi
 
-SRC_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-checkpoint"
+SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
 
 exec_and_log "$CLI dd iimg=$SRC_IMAGE of=$FILE" "Error exporting checkpoint into from $SRC_IMAGE to $FILE"
 exec_and_log "$CLI rm $SRC_IMAGE" "Error removing checkpoint $SRC_IMAGE"
diff --git a/opennebula/remotes/vmm/kvm/save.vitastor b/opennebula/remotes/vmm/kvm/save.vitastor
index fb26b8ef..36c308e3 100755
--- a/opennebula/remotes/vmm/kvm/save.vitastor
+++ b/opennebula/remotes/vmm/kvm/save.vitastor
@@ -26,7 +26,7 @@ done < <($XPATH \
     /VMM_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME)
 
 VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
-IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}"
+IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
 POOL_NAME="${XPATH_ELEMENTS[j++]}"
 
 CLI=vitastor-cli
@@ -37,7 +37,7 @@ if [ -n "$POOL_NAME" ]; then
     CLI="$CLI --pool ${POOL_NAME}"
 fi
 
-DST_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-checkpoint"
+DST_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
 
 exec_and_log "$CLI dd if=$FILE oimg=$DST_IMAGE" "Error importing checkpoint into $DST_IMAGE"
 exec_and_log "$RM -f $FILE" "Error removing checkpoint ($FILE)"
diff --git a/opennebula/vitastor-imageds.conf b/opennebula/vitastor-imageds.conf
index a902d860..29f199ed 100644
--- a/opennebula/vitastor-imageds.conf
+++ b/opennebula/vitastor-imageds.conf
@@ -5,6 +5,6 @@ TYPE = "IMAGE_DS"
 DISK_TYPE = "file"
 BRIDGE_LIST = "opennebula1"
 POOL_NAME = "test1"
-IMAGE_PREFIX = "my"
+IMAGE_PREFIX = "one"
 STAGING_DIR = "/var/tmp"
 VITASTOR_CONF = "/etc/vitastor/vitastor.conf"