From 15d28c11bc85d9deafeec5ab6e5aa67a90d5a79b Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 9 Aug 2013 12:06:59 -0400
Subject: [PATCH] feature-2262: Remove HOST default attribute from iscsi.conf
 and iscsi drivers

---
 src/datastore_mad/remotes/iscsi/clone      | 7 ++++++-
 src/datastore_mad/remotes/iscsi/cp         | 7 ++++++-
 src/datastore_mad/remotes/iscsi/iscsi.conf | 3 ---
 src/datastore_mad/remotes/iscsi/mkfs       | 7 ++++++-
 src/datastore_mad/remotes/iscsi/monitor    | 7 ++++++-
 src/datastore_mad/remotes/iscsi/rm         | 7 ++++++-
 6 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/datastore_mad/remotes/iscsi/clone b/src/datastore_mad/remotes/iscsi/clone
index 331f4b23ec..d1fc5b8a88 100755
--- a/src/datastore_mad/remotes/iscsi/clone
+++ b/src/datastore_mad/remotes/iscsi/clone
@@ -56,12 +56,17 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
 BASE_PATH="${XPATH_ELEMENTS[j++]}"
 RESTRICTED_DIRS="${XPATH_ELEMENTS[j++]}"
 SAFE_DIRS="${XPATH_ELEMENTS[j++]}"
-DST_HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+DST_HOST="${XPATH_ELEMENTS[j++]}"
 VG_NAME="${XPATH_ELEMENTS[j++]:-$VG_NAME}"
 BASE_IQN="${XPATH_ELEMENTS[j++]:-$BASE_IQN}"
 SRC="${XPATH_ELEMENTS[j++]}"
 SIZE="${XPATH_ELEMENTS[j++]}"
 
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
+
 # Check if 'TGTSETUPLUN' is installed
 tgt_setup_lun_install "$DST_HOST" "$BASE_PATH"
 
diff --git a/src/datastore_mad/remotes/iscsi/cp b/src/datastore_mad/remotes/iscsi/cp
index a2b55a817b..dfaec846a6 100755
--- a/src/datastore_mad/remotes/iscsi/cp
+++ b/src/datastore_mad/remotes/iscsi/cp
@@ -64,7 +64,7 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
 BASE_PATH="${XPATH_ELEMENTS[j++]}"
 RESTRICTED_DIRS="${XPATH_ELEMENTS[j++]}"
 SAFE_DIRS="${XPATH_ELEMENTS[j++]}"
-DST_HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+DST_HOST="${XPATH_ELEMENTS[j++]}"
 VG_NAME="${XPATH_ELEMENTS[j++]:-$VG_NAME}"
 BASE_IQN="${XPATH_ELEMENTS[j++]:-$BASE_IQN}"
 SRC="${XPATH_ELEMENTS[j++]}"
@@ -74,6 +74,11 @@ SHA1="${XPATH_ELEMENTS[j++]}"
 NO_DECOMPRESS="${XPATH_ELEMENTS[j++]}"
 LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[j++]}"
 
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
+
 # Check if 'TGTSETUPLUN' is installed
 tgt_setup_lun_install "$DST_HOST" "$BASE_PATH"
 
diff --git a/src/datastore_mad/remotes/iscsi/iscsi.conf b/src/datastore_mad/remotes/iscsi/iscsi.conf
index 2b56cde7e1..48130536f1 100644
--- a/src/datastore_mad/remotes/iscsi/iscsi.conf
+++ b/src/datastore_mad/remotes/iscsi/iscsi.conf
@@ -14,9 +14,6 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-# Default iSCSI target host
-HOST=localhost
-
 # Default IQN path
 BASE_IQN=iqn.2012-02.org.opennebula
 
diff --git a/src/datastore_mad/remotes/iscsi/mkfs b/src/datastore_mad/remotes/iscsi/mkfs
index 6349525ef3..3672a7df6a 100755
--- a/src/datastore_mad/remotes/iscsi/mkfs
+++ b/src/datastore_mad/remotes/iscsi/mkfs
@@ -58,12 +58,17 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
 BASE_PATH="${XPATH_ELEMENTS[j++]}"
 RESTRICTED_DIRS="${XPATH_ELEMENTS[j++]}"
 SAFE_DIRS="${XPATH_ELEMENTS[j++]}"
-DST_HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+DST_HOST="${XPATH_ELEMENTS[j++]}"
 VG_NAME="${XPATH_ELEMENTS[j++]:-$VG_NAME}"
 BASE_IQN="${XPATH_ELEMENTS[j++]:-$BASE_IQN}"
 FSTYPE="${XPATH_ELEMENTS[j++]}"
 SIZE="${XPATH_ELEMENTS[j++]:-0}"
 
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
+
 # Check if 'TGTSETUPLUN' is installed
 tgt_setup_lun_install "$DST_HOST" "$BASE_PATH"
 
diff --git a/src/datastore_mad/remotes/iscsi/monitor b/src/datastore_mad/remotes/iscsi/monitor
index a7410da329..b274511616 100755
--- a/src/datastore_mad/remotes/iscsi/monitor
+++ b/src/datastore_mad/remotes/iscsi/monitor
@@ -48,9 +48,14 @@ while IFS= read -r -d '' element; do
 done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME)
 
-HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+HOST="${XPATH_ELEMENTS[j++]}"
 VG_NAME="${XPATH_ELEMENTS[j++]-$VG_NAME}"
 
+if [ -z "$HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
+
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
diff --git a/src/datastore_mad/remotes/iscsi/rm b/src/datastore_mad/remotes/iscsi/rm
index 4c0af62385..1aa371283d 100755
--- a/src/datastore_mad/remotes/iscsi/rm
+++ b/src/datastore_mad/remotes/iscsi/rm
@@ -48,7 +48,12 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST)
 
 SRC="${XPATH_ELEMENTS[j++]}"
-DST_HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+DST_HOST="${XPATH_ELEMENTS[j++]}"
+
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
 
 BASE_IQN=`echo $SRC|$CUT -d: -f1`
 TARGET=`echo $SRC|$CUT -d: -f2`