From f2b5a80beec35e0ca6ff8d45ea4ce1aa8eadc207 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Fri, 21 Sep 2012 17:19:30 +0200
Subject: [PATCH] =?UTF-8?q?feature=20#=C21360=C2:=20Allow=20empy=20=C3pass?=
 =?UTF-8?q?words?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/datastore_mad/remotes/vmfs/clone        | 2 +-
 src/datastore_mad/remotes/vmfs/cp           | 2 +-
 src/datastore_mad/remotes/vmfs/mkfs         | 2 +-
 src/datastore_mad/remotes/vmfs/rm           | 2 +-
 src/im_mad/remotes/vmware.d/vmware.rb       | 6 +++++-
 src/tm_mad/vmfs/clone                       | 2 +-
 src/tm_mad/vmfs/context                     | 2 +-
 src/tm_mad/vmfs/delete                      | 2 +-
 src/tm_mad/vmfs/mkimage                     | 2 +-
 src/tm_mad/vmfs/mvds                        | 2 +-
 src/vmm_mad/remotes/vmware/vmware_driver.rb | 6 +++++-
 11 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/datastore_mad/remotes/vmfs/clone b/src/datastore_mad/remotes/vmfs/clone
index 36ef27e23b..686441dd2c 100755
--- a/src/datastore_mad/remotes/vmfs/clone
+++ b/src/datastore_mad/remotes/vmfs/clone
@@ -68,7 +68,7 @@ DST_HOST=`get_destination_host $(dirname $0)`
 if [ "$USE_SSH" != "yes" ]; then
     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"
+    VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\""
 fi
 
 # ------------ Copy the image to the repository -------------
diff --git a/src/datastore_mad/remotes/vmfs/cp b/src/datastore_mad/remotes/vmfs/cp
index 52f8c26c3a..29400e304f 100755
--- a/src/datastore_mad/remotes/vmfs/cp
+++ b/src/datastore_mad/remotes/vmfs/cp
@@ -79,7 +79,7 @@ DST_HOST=`get_destination_host $(dirname $0)`
 if [ "$USE_SSH" != "yes" ]; then
     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"
+    VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\""
 fi
 
 # Create DST in DST_HOST
diff --git a/src/datastore_mad/remotes/vmfs/mkfs b/src/datastore_mad/remotes/vmfs/mkfs
index 3fac6f92a7..d9fd4887da 100755
--- a/src/datastore_mad/remotes/vmfs/mkfs
+++ b/src/datastore_mad/remotes/vmfs/mkfs
@@ -74,7 +74,7 @@ DST_HOST=`get_destination_host $(dirname $0)`
 if [ "$USE_SSH" != "yes" ]; then
     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"
+    VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\""
 fi
 
 # ------------ Image to save_as disk, no need to create a FS ------------
diff --git a/src/datastore_mad/remotes/vmfs/rm b/src/datastore_mad/remotes/vmfs/rm
index b393c802c1..54a0ced192 100755
--- a/src/datastore_mad/remotes/vmfs/rm
+++ b/src/datastore_mad/remotes/vmfs/rm
@@ -60,7 +60,7 @@ DST_FOLDER=`basename $SRC`
 if [ "$USE_SSH" != "yes" ]; then
     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"
+    VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\""
 fi
 
 # ------------ Remove the image from the repository ------------
diff --git a/src/im_mad/remotes/vmware.d/vmware.rb b/src/im_mad/remotes/vmware.d/vmware.rb
index 661f7c304e..cd02f42fbe 100755
--- a/src/im_mad/remotes/vmware.d/vmware.rb
+++ b/src/im_mad/remotes/vmware.d/vmware.rb
@@ -99,7 +99,11 @@ conf  = YAML::load(File.read(CONF_FILE))
 @uri  = conf[:libvirt_uri].gsub!('@HOST@', host)
 
 @user = conf[:username]
-@pass = conf[:password]
+if conf[:password] and !conf[:password].empty?
+   @pass=conf[:password]
+else
+   @pass="\"\""
+end
 
 # Poll the VMware hypervisor
 
diff --git a/src/tm_mad/vmfs/clone b/src/tm_mad/vmfs/clone
index cf0cd7529d..624af00eeb 100755
--- a/src/tm_mad/vmfs/clone
+++ b/src/tm_mad/vmfs/clone
@@ -59,7 +59,7 @@ if [ "$USE_SSH" != "yes" ]; then
 	  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/"}"
-    VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
+    VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\""
 fi
 
 if [ "$USE_SSH" == "yes" ]; then
diff --git a/src/tm_mad/vmfs/context b/src/tm_mad/vmfs/context
index 96fef929ec..8d6f720816 100755
--- a/src/tm_mad/vmfs/context
+++ b/src/tm_mad/vmfs/context
@@ -53,7 +53,7 @@ DST_FOLDER=`basename $DST_PATH`
 if [ "$USE_SSH" != "yes" ]; then
     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"
+    VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\""
 fi
 
 if [ "$USE_SSH" == "yes" ]; then
diff --git a/src/tm_mad/vmfs/delete b/src/tm_mad/vmfs/delete
index f38cc65175..8436adc417 100755
--- a/src/tm_mad/vmfs/delete
+++ b/src/tm_mad/vmfs/delete
@@ -60,7 +60,7 @@ if [ "$USE_SSH" == "yes" ]; then
 else
 	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"
+    VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\""
 
 	DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
 	for dir in $DIRS_TO_ERASE; do
diff --git a/src/tm_mad/vmfs/mkimage b/src/tm_mad/vmfs/mkimage
index c6a1f090b9..281dd6148f 100755
--- a/src/tm_mad/vmfs/mkimage
+++ b/src/tm_mad/vmfs/mkimage
@@ -55,7 +55,7 @@ if [ "$USE_SSH" != "yes" ]; then
     SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))`
     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"
+    VI_PARAMS="--server $DST_HOST --username $USERNAME --password \"$PASSWORD\""
 fi
 
 #-------------------------------------------------------------------------------
diff --git a/src/tm_mad/vmfs/mvds b/src/tm_mad/vmfs/mvds
index 9792490c80..2c47e9e9ba 100755
--- a/src/tm_mad/vmfs/mvds
+++ b/src/tm_mad/vmfs/mvds
@@ -61,7 +61,7 @@ if [ "$USE_SSH" != "yes" ]; then
     SYSTEM_DS_NAME=`basename $(dirname $(dirname $SRC_PATH))`
     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 $SRC_HOST --username $USERNAME --password $PASSWORD"
+    VI_PARAMS="--server $SRC_HOST --username $USERNAME --password \"$PASSWORD\""
 fi
 
 #-------------------------------------------------------------------------------
diff --git a/src/vmm_mad/remotes/vmware/vmware_driver.rb b/src/vmm_mad/remotes/vmware/vmware_driver.rb
index c6b902f850..7ca1079eea 100644
--- a/src/vmm_mad/remotes/vmware/vmware_driver.rb
+++ b/src/vmm_mad/remotes/vmware/vmware_driver.rb
@@ -50,7 +50,11 @@ class VMwareDriver
        @uri  = conf[:libvirt_uri].gsub!('@HOST@', host)
 
        @user = conf[:username]
-       @pass = conf[:password]
+       if conf[:password] and !conf[:password].empty?
+          @pass=conf[:password]
+       else
+          @pass="\"\""
+       end
 
        @datacenter = conf[:datacenter]
        @vcenter    = conf[:vcenter]