From ed368ed2259608aa856fd52d30a160b5004d8a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 22 Oct 2013 17:52:23 +0200
Subject: [PATCH] Revert "feature #1678: Datastores report LN and CLONE target
 as SYSTEM, SELF or NONE"

This reverts commit 7a02a4cf9667cf105242e19fa745378d3282c56b.

Conflicts:
	src/image/ImageManagerDriver.cc
---
 src/datastore_mad/remotes/ceph/monitor  |  2 --
 src/datastore_mad/remotes/dummy/monitor |  2 --
 src/datastore_mad/remotes/fs/monitor    | 27 +++----------------------
 src/datastore_mad/remotes/iscsi/monitor |  2 --
 src/datastore_mad/remotes/lvm/monitor   |  2 --
 src/datastore_mad/remotes/vmfs/monitor  |  2 --
 6 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/monitor b/src/datastore_mad/remotes/ceph/monitor
index cf6e7aee18..406cc1c4ab 100755
--- a/src/datastore_mad/remotes/ceph/monitor
+++ b/src/datastore_mad/remotes/ceph/monitor
@@ -79,8 +79,6 @@ EOF
 MONITOR_DATA=$(ssh_monitor_and_log $HOST "$MONITOR_SCRIPT" 2>&1)
 MONITOR_STATUS=$?
 
-MONITOR_DATA="$MONITOR_DATA LN_TARGET=NONE CLONE_TARGET=SELF"
-
 if [ "$MONITOR_STATUS" = "0" ]; then
     echo "$MONITOR_DATA" | tr ' ' '\n'
 else
diff --git a/src/datastore_mad/remotes/dummy/monitor b/src/datastore_mad/remotes/dummy/monitor
index d8caa01cea..a0bc478062 100755
--- a/src/datastore_mad/remotes/dummy/monitor
+++ b/src/datastore_mad/remotes/dummy/monitor
@@ -19,5 +19,3 @@
 echo "USED_MB=9720"
 echo "TOTAL_MB=20480"
 echo "FREE_MB=20480"
-echo "LN_TARGET=NONE"
-echo "CLONE_TARTGET=SYSTEM"
diff --git a/src/datastore_mad/remotes/fs/monitor b/src/datastore_mad/remotes/fs/monitor
index 9acdfa2fda..0fdcd36bb4 100755
--- a/src/datastore_mad/remotes/fs/monitor
+++ b/src/datastore_mad/remotes/fs/monitor
@@ -40,32 +40,13 @@ ID=$2
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 
-unset i j XPATH_ELEMENTS
+unset i XPATH_ELEMENTS
 
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
-done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/TM_MAD \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH)
+done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH)
 
-TM_MAD="${XPATH_ELEMENTS[j++]}"
-BASE_PATH="${XPATH_ELEMENTS[j++]}"
-
-case $TM_MAD in
-    "ssh")
-    LN_TARGET="SYSTEM"
-    CLONE_TARGET="SYSTEM"
-    ;;
-
-    "lvm_shared")
-    LN_TARGET="SYSTEM"
-    CLONE_TARGET="SYSTEM"
-    ;;
-
-    *) #shared, qcow2
-    LN_TARGET="NONE"
-    CLONE_TARGET="SYSTEM"
-    ;;
-esac
+BASE_PATH="${XPATH_ELEMENTS[0]}"
 
 # ------------ Compute datastore usage -------------
 
@@ -81,8 +62,6 @@ MONITOR_DATA=$(cat <<EOF
 USED_MB=$USED_MB
 TOTAL_MB=$TOTAL_MB
 FREE_MB=$FREE_MB
-LN_TARGET=$LN_TARGET
-CLONE_TARGET=$CLONE_TARGET
 EOF
 )
 
diff --git a/src/datastore_mad/remotes/iscsi/monitor b/src/datastore_mad/remotes/iscsi/monitor
index 2c09a73bb1..45fc9c5b60 100755
--- a/src/datastore_mad/remotes/iscsi/monitor
+++ b/src/datastore_mad/remotes/iscsi/monitor
@@ -78,8 +78,6 @@ EOF
 MONITOR_DATA=$(ssh_monitor_and_log $HOST "$MONITOR_SCRIPT" 2>&1)
 MONITOR_STATUS=$?
 
-MONITOR_DATA="$MONITOR_DATA LN_TARGET=NONE CLONE_TARGET=SELF"
-
 if [ "$MONITOR_STATUS" = "0" ]; then
     echo "$MONITOR_DATA" | tr ' ' '\n'
 else
diff --git a/src/datastore_mad/remotes/lvm/monitor b/src/datastore_mad/remotes/lvm/monitor
index 97d2844126..f431e09690 100755
--- a/src/datastore_mad/remotes/lvm/monitor
+++ b/src/datastore_mad/remotes/lvm/monitor
@@ -77,8 +77,6 @@ EOF
 MONITOR_DATA=$(ssh_monitor_and_log $HOST "$MONITOR_SCRIPT" 2>&1)
 MONITOR_STATUS=$?
 
-MONITOR_DATA="$MONITOR_DATA LN_TARGET=NONE CLONE_TARGET=SELF"
-
 if [ "$MONITOR_STATUS" = "0" ]; then
     echo "$MONITOR_DATA" | tr ' ' '\n'
 else
diff --git a/src/datastore_mad/remotes/vmfs/monitor b/src/datastore_mad/remotes/vmfs/monitor
index 40c7cef011..f88824d3c1 100755
--- a/src/datastore_mad/remotes/vmfs/monitor
+++ b/src/datastore_mad/remotes/vmfs/monitor
@@ -78,8 +78,6 @@ EOF
 MONITOR_DATA=$(ssh_monitor_and_log $HOST "$MONITOR_SCRIPT" 2>&1)
 MONITOR_STATUS=$?
 
-MONITOR_DATA="$MONITOR_DATA LN_TARGET=NONE CLONE_TARGET=SYSTEM"
-
 if [ "$MONITOR_STATUS" = "0" ]; then
     echo "$MONITOR_DATA" | tr ' ' '\n'
 else