From c662f193997027ec35fca91fcda3f99706085b86 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Mon, 12 Nov 2012 17:40:53 +0100
Subject: [PATCH] bug #1635: Pass correct ds id to delete script

---
 src/tm/TransferManager.cc | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc
index 497fc32e19..708a2093e0 100644
--- a/src/tm/TransferManager.cc
+++ b/src/tm/TransferManager.cc
@@ -805,26 +805,10 @@ void TransferManager::epilog_transfer_command(
     string ds_id;
     int    disk_id;
 
-    if ( isVolatile(disk) == true )
-    {
-        save   = "NO";
-        tm_mad = vm->get_tm_mad();
-        ds_id  = vm->get_ds_id();
-    }
-    else
-    {
-        save   = disk->vector_value("SAVE");
-        tm_mad = disk->vector_value("TM_MAD");
-        ds_id  = disk->vector_value("DATASTORE_ID");
-
-        if ( save.empty() || ds_id.empty() || tm_mad.empty() )
-        {
-            return;
-        }
-    }
-
     disk->vector_value("DISK_ID", disk_id);
 
+    save  = disk->vector_value("SAVE");
+
     transform(save.begin(),save.end(),save.begin(),(int(*)(int))toupper);
 
     if ( save == "YES" )
@@ -835,6 +819,15 @@ void TransferManager::epilog_transfer_command(
         source      = disk->vector_value("SOURCE");
         save_source = disk->vector_value("SAVE_AS_SOURCE");
 
+        tm_mad = disk->vector_value("TM_MAD");
+        ds_id  = disk->vector_value("DATASTORE_ID");
+
+        if ( ds_id.empty() || tm_mad.empty() )
+        {
+            vm->log("TM", Log::ERROR, "No DS_ID or TM_MAD to save disk image");
+            return;
+        }
+
         if (source.empty() && save_source.empty())
         {
             vm->log("TM", Log::ERROR, "No SOURCE to save disk image");
@@ -860,11 +853,11 @@ void TransferManager::epilog_transfer_command(
     {
         //DELETE tm_mad hostname:remote_system_dir/disk.i vmid ds_id
         xfr << "DELETE "
-            << tm_mad << " "
+            << vm->get_tm_mad() << " "
             << vm->get_hostname() << ":"
             << vm->get_remote_system_dir() << "/disk." << disk_id << " "
             << vm->get_oid() << " "
-            << ds_id
+            << vm->get_ds_id()
             << endl;
     }
 }