From 33f81172c014a4d2db90a43aecbe80f2fce25df2 Mon Sep 17 00:00:00 2001 From: Sergio Semedi Barranco Date: Fri, 22 Sep 2017 16:43:53 +0200 Subject: [PATCH] remove trailing slashes VCENTER_DS_IMAGE_DIR (#484) --- src/datastore_mad/remotes/vcenter/clone | 2 +- src/datastore_mad/remotes/vcenter/cp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datastore_mad/remotes/vcenter/clone b/src/datastore_mad/remotes/vcenter/clone index 2efc36bb14..d40a0e0d0c 100755 --- a/src/datastore_mad/remotes/vcenter/clone +++ b/src/datastore_mad/remotes/vcenter/clone @@ -36,7 +36,7 @@ drv_action = OpenNebula::XMLElement.new drv_action.initialize_xml(Base64.decode64(drv_action_enc), 'DS_DRIVER_ACTION_DATA') target_ds_ref = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_REF"] -ds_image_dir = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_IMAGE_DIR"] || "one" +ds_image_dir = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_IMAGE_DIR"].match(%r{^/*(.*?)/*$})[1] || "one" src_path_escaped = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/PATH"] src_img_id = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/CLONING_ID"] diff --git a/src/datastore_mad/remotes/vcenter/cp b/src/datastore_mad/remotes/vcenter/cp index d3103a7ec8..370cee5d66 100755 --- a/src/datastore_mad/remotes/vcenter/cp +++ b/src/datastore_mad/remotes/vcenter/cp @@ -40,7 +40,7 @@ drv_action.initialize_xml(Base64.decode64(drv_action_enc), 'DS_DRIVER_ACTION_DAT img_path = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/PATH"] ds_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/ID"] ds_ref = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_REF"] -ds_image_dir = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_IMAGE_DIR"] || "one" +ds_image_dir = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_IMAGE_DIR"].match(%r{^/*(.*?)/*$})[1] || "one" md5 = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5"] sha1 = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1"] nodecomp = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS"]