shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #1437: Remove quotes in username and password

Browse Source
This commit is contained in:
Tino Vazquez 2012-09-12 20:05:54 +02:00
parent b15513d495
commit e554d5cd26
9 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/datastore_mad/remotes/vmfs/clone
View File

@ -66,8 +66,8 @@ DST_FOLDER=`basename $DST`
DST_HOST=`get_destination_host $(dirname $0)`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
fi

24
src/datastore_mad/remotes/vmfs/cp
View File

@ -51,6 +51,7 @@ unset i XPATH_ELEMENTS
while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
/DS_DRIVER_ACTION_DATA/DATASTORE/ID \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RESTRICTED_DIRS \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/SAFE_DIRS \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/UMASK \
@ -59,22 +60,25 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1)
BASE_PATH="${XPATH_ELEMENTS[0]}"
RESTRICTED_DIRS="${XPATH_ELEMENTS[1]}"
SAFE_DIRS="${XPATH_ELEMENTS[2]}"
UMASK="${XPATH_ELEMENTS[3]}"
SRC="${XPATH_ELEMENTS[4]}"
MD5="${XPATH_ELEMENTS[5]}"
SHA1="${XPATH_ELEMENTS[6]}"
DS_ID="${XPATH_ELEMENTS[1]}"
RESTRICTED_DIRS="${XPATH_ELEMENTS[2]}"
SAFE_DIRS="${XPATH_ELEMENTS[3]}"
UMASK="${XPATH_ELEMENTS[4]}"
SRC="${XPATH_ELEMENTS[5]}"
MD5="${XPATH_ELEMENTS[6]}"
SHA1="${XPATH_ELEMENTS[7]}"
# Set up the datastore
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
DST=`generate_image_path`
DST_FOLDER=`basename $DST`
DST="/vmfs/volumes/$DS_ID/$DST_FOLDER"
DST_HOST=`get_destination_host $(dirname $0)`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
fi
@ -82,7 +86,7 @@ fi
if [ "$SSH" == "yes" ]; then
ssh_make_path $DST_HOST $DST
else
exec_and_log "vifs $VI_PARAMS --mkdir $DST" "Cannot create $DST in $DST_HOST"
exec_and_log "vifs $VI_PARAMS --mkdir \"[$DS_ID] $DST_FOLDER\"" "Cannot create $DST in $DST_HOST"
fi
# Prepare for a possible download in the front-end
@ -143,7 +147,7 @@ else
cd $SRC
for file in $(find . -type f); do
FNAME=$(basename $file)
exec_and_log "vifs $VI_PARAMS -p $file $DST/$FNAME" "Cannot upload $file to $DST/$FNAME on $DST_HOST"
exec_and_log "vifs $VI_PARAMS -p $file \"[$DS_ID] $DST_FOLDER/$FNAME\"" "Cannot upload $file to $DST/$FNAME on $DST_HOST"
done
fi

4
src/datastore_mad/remotes/vmfs/mkfs
View File

@ -72,8 +72,8 @@ DST_FOLDER_NAME=`basename $DST`
DST_HOST=`get_destination_host $(dirname $0)`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
REMOTE_DS_ROUTE="$IMAGE_DS_ID]$DST_FOLDER_NAME"
VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
fi

4
src/datastore_mad/remotes/vmfs/rm
View File

@ -58,8 +58,8 @@ DST_HOST=`get_destination_host $(dirname $0)`
FOLDER_TO_ERASE=`dirname SRC`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
fi

4
src/tm_mad/vmware/clone
View File

@ -53,8 +53,8 @@ DST_HOST=`arg_host $DST`
DST_DIR=`dirname $DST_PATH`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
IMAGE_DS_NAME=`basename $(dirname $SRC_PATH)`
SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))`
DST_DIR_WITHOUT_DS_PATH="[$SYSTEM_DS_NAME] ${DST_PATH##"$DS_DIR/$SYSTEM_DS_NAME/"}"

4
src/tm_mad/vmware/context
View File

@ -50,8 +50,8 @@ DST_HOST=`arg_host $DST`
DST_DIR=`dirname $DST_PATH`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
fi

4
src/tm_mad/vmware/delete
View File

@ -55,8 +55,8 @@ log "Deleting $DST_PATH"
if [ "$SSH" == "yes" ]; then
ssh_exec_and_log $DST_HOST "rm -rf $DST_PATH" "Error deleting $DST_PATH"
else
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
exec_and_log "$VMKFSTOOLS --server $DST_HOST --username $USERNAME --password $PASSWORD -U $DST_PATH" "Cannot delelete $DST"
fi

4
src/tm_mad/vmware/mkimage
View File

@ -52,8 +52,8 @@ DST_DIR=`dirname $DST_PATH`
if [ "$SSH" != "yes" ]; then
SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
DST_DIR_WITHOUT_DS_PATH="[$SYSTEM_DS_NAME] ${DST_PATH##"$DS_DIR/$SYSTEM_DS_NAME/"}"
VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
fi

4
src/tm_mad/vmware/mvds
View File

@ -43,8 +43,8 @@ fi
source $(dirname $0)/tm_vmwarerc
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
fi