From 64cf127ea71c272db4e2929e1625fd007af142ba Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Tue, 8 Jul 2014 23:52:38 +0200
Subject: [PATCH] bug #2960: TM actions use CLONE instead of PERSISTENT

---
 src/tm_mad/ceph/cpds   |  6 +++---
 src/tm_mad/ceph/delete | 12 +++++++-----
 src/tm_mad/ceph/mvds   | 12 +++++++-----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/tm_mad/ceph/cpds b/src/tm_mad/ceph/cpds
index c8acee174a..95e47c287d 100755
--- a/src/tm_mad/ceph/cpds
+++ b/src/tm_mad/ceph/cpds
@@ -59,16 +59,16 @@ while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT)
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
 
 RBD_SRC="${XPATH_ELEMENTS[j++]}"
-PERSISTENT="${XPATH_ELEMENTS[j++]}"
+CLONE="${XPATH_ELEMENTS[j++]}"
 
 #-------------------------------------------------------------------------------
 # Copy Image back to the datastore
 #-------------------------------------------------------------------------------
 
-if [ "$PERSISTENT" = "YES" ]; then
+if [ "$CLONE" = "NO" ]; then
     RBD_DST="${RBD_SRC}"
 else
     RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"
diff --git a/src/tm_mad/ceph/delete b/src/tm_mad/ceph/delete
index 4baeffd31c..4e7a0bd365 100755
--- a/src/tm_mad/ceph/delete
+++ b/src/tm_mad/ceph/delete
@@ -67,15 +67,17 @@ while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT)
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
 
 SRC="${XPATH_ELEMENTS[j++]}"
-PERSISTENT="${XPATH_ELEMENTS[j++]}"
+CLONE="${XPATH_ELEMENTS[j++]}"
 
-# Exit if persistent
-[ -n "$PERSISTENT" ] && exit 0
+# No need to delete no cloned images
+if [ "$CLONE" = "NO" ]; then
+    exit 0
+fi
 
-# non persistent, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
+# cloned, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
 RBD_SRC="${SRC}-${VM_ID}-${DISK_ID}"
 RBD_SNAP="${VM_ID}-${DISK_ID}"
 
diff --git a/src/tm_mad/ceph/mvds b/src/tm_mad/ceph/mvds
index 2bf9710fd4..8a64f1afe8 100755
--- a/src/tm_mad/ceph/mvds
+++ b/src/tm_mad/ceph/mvds
@@ -59,15 +59,17 @@ while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT)
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
 
 RBD_SRC="${XPATH_ELEMENTS[j++]}"
-PERSISTENT="${XPATH_ELEMENTS[j++]}"
+CLONE="${XPATH_ELEMENTS[j++]}"
 
-# Exit if persistent
-[ -n "$PERSISTENT" ] && exit 0
+# No need to copy back to datastore no cloned images
+if [ "$CLONE" = "NO" ]; then
+    exit 0
+fi
 
-# non persistent, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
+# cloned, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
 RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"
 RBD_SNAP="${VM_ID}-${DISK_ID}"