From d3d122592b1bde3664ce9fe5782832ac12262f8a Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 28 Jun 2012 14:46:54 +0200
Subject: [PATCH] Feature #1254: BASE_TID is hardcoded to 1. TARGET_CONF is
 globally defined in the configuration file.

---
 src/datastore_mad/remotes/iscsi/cp         | 13 +++++--------
 src/datastore_mad/remotes/iscsi/iscsi.conf |  3 ---
 src/datastore_mad/remotes/iscsi/mkfs       | 10 ++--------
 src/datastore_mad/remotes/iscsi/rm         |  4 +---
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/datastore_mad/remotes/iscsi/cp b/src/datastore_mad/remotes/iscsi/cp
index 22dec153e9..1e693e5033 100755
--- a/src/datastore_mad/remotes/iscsi/cp
+++ b/src/datastore_mad/remotes/iscsi/cp
@@ -56,7 +56,6 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /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/DATASTORE/TEMPLATE/TARGET_CONF \
                     /DS_DRIVER_ACTION_DATA/IMAGE/PATH \
                     /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
@@ -69,12 +68,10 @@ 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}"
-TARGET_CONF="${XPATH_ELEMENTS[8]:-$TARGET_CONF}"
-SRC="${XPATH_ELEMENTS[9]}"
-SIZE="${XPATH_ELEMENTS[10]}"
-MD5="${XPATH_ELEMENTS[11]}"
-SHA1="${XPATH_ELEMENTS[12]}"
+SRC="${XPATH_ELEMENTS[7]}"
+SIZE="${XPATH_ELEMENTS[8]}"
+MD5="${XPATH_ELEMENTS[9]}"
+SHA1="${XPATH_ELEMENTS[10]}"
 
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
 
@@ -88,7 +85,7 @@ REGISTER_CMD=$(cat <<EOF
 
     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")
diff --git a/src/datastore_mad/remotes/iscsi/iscsi.conf b/src/datastore_mad/remotes/iscsi/iscsi.conf
index bae4f9c620..c4e7ec18e3 100644
--- a/src/datastore_mad/remotes/iscsi/iscsi.conf
+++ b/src/datastore_mad/remotes/iscsi/iscsi.conf
@@ -23,9 +23,6 @@ BASE_IQN=iqn.2012-02.org.opennebula
 # Default volume group
 VG_NAME=vg-one
 
-# Starting TID for iSCSI targets
-BASE_TID=1
-
 # Lists of hosts (separated by spaces) for which no iscsiadm login or logout
 # is performed.
 NO_ISCSI="$HOSTNAME"
diff --git a/src/datastore_mad/remotes/iscsi/mkfs b/src/datastore_mad/remotes/iscsi/mkfs
index 1aea7c62fd..9731155904 100755
--- a/src/datastore_mad/remotes/iscsi/mkfs
+++ b/src/datastore_mad/remotes/iscsi/mkfs
@@ -53,8 +53,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/DATASTORE/TEMPLATE/TARGET_CONF \
                     /DS_DRIVER_ACTION_DATA/IMAGE/FSTYPE \
                     /DS_DRIVER_ACTION_DATA/IMAGE/SIZE)
 
@@ -65,10 +63,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}"
-TARGET_CONF="${XPATH_ELEMENTS[8]:-$TARGET_CONF}"
-FSTYPE="${XPATH_ELEMENTS[9]}"
-SIZE="${XPATH_ELEMENTS[10]:-0}"
+FSTYPE="${XPATH_ELEMENTS[7]}"
+SIZE="${XPATH_ELEMENTS[8]:-0}"
 
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
 
@@ -76,8 +72,6 @@ LV_NAME="lv-one-${ID}"
 IQN="$BASE_IQN:$DST_HOST.$VG_NAME.$LV_NAME"
 DEV="/dev/$VG_NAME/$LV_NAME"
 
-# ------------ Image to save_as disk, no need to create a FS ------------
-
 REGISTER_CMD=$(cat <<EOF
     set -e
     $SUDO $LVCREATE -L${SIZE}M ${VG_NAME} -n ${LV_NAME}
diff --git a/src/datastore_mad/remotes/iscsi/rm b/src/datastore_mad/remotes/iscsi/rm
index f60a4fdb38..bcc9143d2d 100755
--- a/src/datastore_mad/remotes/iscsi/rm
+++ b/src/datastore_mad/remotes/iscsi/rm
@@ -45,12 +45,10 @@ unset i XPATH_ELEMENTS
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <($XPATH     /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_TID)
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST)
 
 SRC="${XPATH_ELEMENTS[0]}"
 DST_HOST="${XPATH_ELEMENTS[1]:-$HOST}"
-BASE_TID="${XPATH_ELEMENTS[2]:-$BASE_TID}"
 
 BASE_IQN=`echo $SRC|$CUT -d: -f1`
 TARGET=`echo $SRC|$CUT -d: -f2`