From 4abee17eafa89e3539b1d7f467fc792cfac114f0 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 28 Jun 2012 16:11:54 +0200
Subject: [PATCH] Feature #1254: Completely drop BASE_TID

---
 src/datastore_mad/remotes/iscsi/clone | 16 +++++++---------
 src/datastore_mad/remotes/iscsi/cp    |  1 -
 src/datastore_mad/remotes/iscsi/mkfs  |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/datastore_mad/remotes/iscsi/clone b/src/datastore_mad/remotes/iscsi/clone
index 4dbdd8a821..f60dd02fa8 100755
--- a/src/datastore_mad/remotes/iscsi/clone
+++ b/src/datastore_mad/remotes/iscsi/clone
@@ -51,7 +51,6 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_IQN \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_TID \
                     /DS_DRIVER_ACTION_DATA/IMAGE/PATH \
                     /DS_DRIVER_ACTION_DATA/IMAGE/SIZE)
 
@@ -62,9 +61,8 @@ UMASK="${XPATH_ELEMENTS[3]}"
 DST_HOST="${XPATH_ELEMENTS[4]:-$HOST}"
 VG_NAME="${XPATH_ELEMENTS[5]:-$VG_NAME}"
 BASE_IQN="${XPATH_ELEMENTS[6]:-$BASE_IQN}"
-BASE_TID="${XPATH_ELEMENTS[7]:-$BASE_TID}"
-SRC="${XPATH_ELEMENTS[8]}"
-SIZE="${XPATH_ELEMENTS[9]}"
+SRC="${XPATH_ELEMENTS[7]}"
+SIZE="${XPATH_ELEMENTS[8]}"
 
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
 
@@ -72,8 +70,6 @@ LV_NAME="lv-one-${ID}"
 IQN="$BASE_IQN:$DST_HOST.$VG_NAME.$LV_NAME"
 DEV="/dev/$VG_NAME/$LV_NAME"
 
-let TID=ID+BASE_TID
-
 LV_SRC=$(echo $SRC|awk -F. '{print $NF}')
 DEV_SRC="/dev/$VG_NAME/$LV_SRC"
 
@@ -82,9 +78,11 @@ CLONE_CMD=$(cat <<EOF
     $SUDO $LVCREATE -L${SIZE}M ${VG_NAME} -n ${LV_NAME}
     $SUDO $DD if=$DEV_SRC of=$DEV bs=64k
 
-    $SUDO $(tgtadm_target_new "$TID" "$IQN")
-    $SUDO $(tgtadm_target_bind_all "$TID")
-    $SUDO $(tgtadm_logicalunit_new "$TID" "$DEV")
+    TID=\$($SUDO $(tgtadm_next_tid))
+
+    $SUDO $(tgtadm_target_new "\$TID" "$IQN")
+    $SUDO $(tgtadm_target_bind_all "\$TID")
+    $SUDO $(tgtadm_logicalunit_new "\$TID" "$DEV")
     $SUDO $(tgt_admin_dump_config "$TARGET_CONF")
 EOF
 )
diff --git a/src/datastore_mad/remotes/iscsi/cp b/src/datastore_mad/remotes/iscsi/cp
index 1e693e5033..79ce7f18ae 100755
--- a/src/datastore_mad/remotes/iscsi/cp
+++ b/src/datastore_mad/remotes/iscsi/cp
@@ -55,7 +55,6 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_IQN \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_TID \
                     /DS_DRIVER_ACTION_DATA/IMAGE/PATH \
                     /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
diff --git a/src/datastore_mad/remotes/iscsi/mkfs b/src/datastore_mad/remotes/iscsi/mkfs
index 9731155904..5554e9bcca 100755
--- a/src/datastore_mad/remotes/iscsi/mkfs
+++ b/src/datastore_mad/remotes/iscsi/mkfs
@@ -77,7 +77,7 @@ REGISTER_CMD=$(cat <<EOF
     $SUDO $LVCREATE -L${SIZE}M ${VG_NAME} -n ${LV_NAME}
 
     TID=\$($SUDO $(tgtadm_next_tid))
-    [ -z "\$TID" ] && TID=$BASE_TID
+    [ -z "\$TID" ] && TID=1
 
     $SUDO $(tgtadm_target_new "\$TID" "$IQN")
     $SUDO $(tgtadm_target_bind_all "\$TID")