mirror of
https://github.com/OpenNebula/one.git
synced 2025-01-08 21:17:43 +03:00
B #6162: Use stdin for datastore drivers
New option for datastore driver (--stdin) that sends driver information through stdin. Driver actions will read stdin if the first argument is '-'. This change is compatible with drivers that read input from argument command line. By default the driver will work using the command line arguments. Monitor scripts part of the transfer manager are also updated File oned.conf is changed to use stdin by default (cherry picked from commit8c12a8dbcd
) (cherry picked from commitaa1e6b4196
)
This commit is contained in:
parent
e3ceecc132
commit
52156312fc
@ -662,7 +662,7 @@ TM_MAD = [
|
||||
|
||||
DATASTORE_MAD = [
|
||||
EXECUTABLE = "one_datastore",
|
||||
ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,dev,iscsi_libvirt,vcenter,restic,rsync -s shared,ssh,ceph,fs_lvm,fs_lvm_ssh,qcow2,vcenter"
|
||||
ARGUMENTS = "-i -t 15 -d dummy,fs,lvm,ceph,dev,iscsi_libvirt,vcenter,restic,rsync -s shared,ssh,ceph,fs_lvm,fs_lvm_ssh,qcow2,vcenter"
|
||||
]
|
||||
|
||||
#*******************************************************************************
|
||||
|
@ -93,6 +93,7 @@ class DatastoreDriver < OpenNebulaDriver
|
||||
:concurrency => 10,
|
||||
:threaded => true,
|
||||
:retries => 0,
|
||||
:stdin => false,
|
||||
:local_actions => {
|
||||
ACTION[:stat] => nil,
|
||||
ACTION[:cp] => nil,
|
||||
@ -148,62 +149,62 @@ class DatastoreDriver < OpenNebulaDriver
|
||||
|
||||
def cp(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :cp, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :cp, drv_message)
|
||||
end
|
||||
|
||||
def rm(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :rm, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :rm, drv_message)
|
||||
end
|
||||
|
||||
def mkfs(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :mkfs, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :mkfs, drv_message)
|
||||
end
|
||||
|
||||
def stat(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :stat, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :stat, drv_message)
|
||||
end
|
||||
|
||||
def clone(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :clone, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :clone, drv_message)
|
||||
end
|
||||
|
||||
def monitor(id, drv_message)
|
||||
ds, sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :monitor, "#{drv_message} #{id}", sys, true)
|
||||
do_image_action(id, ds, :monitor, drv_message, sys, true)
|
||||
end
|
||||
|
||||
def snap_delete(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :snap_delete, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :snap_delete, drv_message)
|
||||
end
|
||||
|
||||
def snap_revert(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :snap_revert, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :snap_revert, drv_message)
|
||||
end
|
||||
|
||||
def snap_flatten(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :snap_flatten, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :snap_flatten, drv_message)
|
||||
end
|
||||
|
||||
def restore(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :restore, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :restore, drv_message)
|
||||
end
|
||||
|
||||
def increment_flatten(id, drv_message)
|
||||
ds, _sys = get_ds_type(drv_message)
|
||||
do_image_action(id, ds, :increment_flatten, "#{drv_message} #{id}")
|
||||
do_image_action(id, ds, :increment_flatten, drv_message)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def is_available?(ds, id, action)
|
||||
def available?(ds, id, action)
|
||||
if @types.include?(ds)
|
||||
true
|
||||
else
|
||||
@ -213,7 +214,7 @@ class DatastoreDriver < OpenNebulaDriver
|
||||
end
|
||||
end
|
||||
|
||||
def is_sys_available?(sys, id, action)
|
||||
def sys_available?(sys, id, action)
|
||||
if @sys_types.include?(sys)
|
||||
true
|
||||
else
|
||||
@ -223,21 +224,29 @@ class DatastoreDriver < OpenNebulaDriver
|
||||
end
|
||||
end
|
||||
|
||||
def do_image_action(id, ds, action, arguments, sys = '', encode64 = false)
|
||||
# rubocop:disable Metrics/ParameterLists
|
||||
def do_image_action(id, ds, action, stdin, sys = '', encode64 = false)
|
||||
if !sys.empty?
|
||||
return unless is_sys_available?(sys, id, action)
|
||||
return unless sys_available?(sys, id, action)
|
||||
|
||||
path = File.join(@local_tm_scripts_path, sys)
|
||||
else
|
||||
return unless is_available?(ds, id, action)
|
||||
return unless available?(ds, id, action)
|
||||
|
||||
path = File.join(@local_scripts_path, ds)
|
||||
end
|
||||
|
||||
cmd = File.join(path, ACTION[action].downcase)
|
||||
cmd << ' ' << arguments
|
||||
if @options[:stdin]
|
||||
arguments = " - #{id}"
|
||||
else
|
||||
arguments = " #{stdin} #{id}"
|
||||
stdin = nil
|
||||
end
|
||||
|
||||
rc = LocalCommand.run(cmd, log_method(id))
|
||||
cmd = File.join(path, ACTION[action].downcase)
|
||||
cmd << arguments
|
||||
|
||||
rc = LocalCommand.run(cmd, log_method(id), stdin)
|
||||
|
||||
result, info = get_info_from_execution(rc)
|
||||
|
||||
@ -245,6 +254,7 @@ class DatastoreDriver < OpenNebulaDriver
|
||||
|
||||
send_message(ACTION[action], result, id, info)
|
||||
end
|
||||
# rubocop:enable Metrics/ParameterLists
|
||||
|
||||
def get_ds_type(drv_message)
|
||||
message = Base64.decode64(drv_message)
|
||||
@ -274,16 +284,18 @@ end
|
||||
################################################################################
|
||||
|
||||
opts = GetoptLong.new(
|
||||
['--threads', '-t', GetoptLong::OPTIONAL_ARGUMENT],
|
||||
['--ds-types', '-d', GetoptLong::OPTIONAL_ARGUMENT],
|
||||
['--threads', '-t', GetoptLong::OPTIONAL_ARGUMENT],
|
||||
['--ds-types', '-d', GetoptLong::OPTIONAL_ARGUMENT],
|
||||
['--system-ds-types', '-s', GetoptLong::OPTIONAL_ARGUMENT],
|
||||
['--timeout', '-w', GetoptLong::OPTIONAL_ARGUMENT]
|
||||
['--timeout', '-w', GetoptLong::OPTIONAL_ARGUMENT],
|
||||
['--stdin', '-i', GetoptLong::NO_ARGUMENT]
|
||||
)
|
||||
|
||||
ds_type = nil
|
||||
sys_ds_type = nil
|
||||
threads = 15
|
||||
timeout = nil
|
||||
stdin = false
|
||||
|
||||
begin
|
||||
opts.each do |opt, arg|
|
||||
@ -296,13 +308,16 @@ begin
|
||||
sys_ds_type = arg.split(',').map {|a| a.strip }
|
||||
when '--timeout'
|
||||
timeout = arg.to_i
|
||||
when '--stdin'
|
||||
stdin = true
|
||||
end
|
||||
end
|
||||
rescue StandardError
|
||||
rescue StandardError => _e
|
||||
exit(-1)
|
||||
end
|
||||
|
||||
ds_driver = DatastoreDriver.new(ds_type, sys_ds_type,
|
||||
:concurrency => threads,
|
||||
:timeout => timeout)
|
||||
:concurrency => threads,
|
||||
:timeout => timeout,
|
||||
:stdin => stdin)
|
||||
ds_driver.start_driver
|
||||
|
@ -38,6 +38,10 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -40,6 +40,10 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
export DRV_ACTION
|
||||
|
||||
UTILS_PATH="${DRIVER_PATH}/.."
|
||||
|
@ -39,6 +39,10 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -41,6 +41,10 @@ source ${DRIVER_PATH}/../../etc/datastore/datastore.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -40,6 +40,10 @@ source ${DRIVER_PATH}/ceph_utils.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i j XPATH_ELEMENTS
|
||||
|
@ -40,6 +40,10 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i j XPATH_ELEMENTS
|
||||
|
@ -41,6 +41,10 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -41,6 +41,10 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -41,6 +41,10 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -20,6 +20,8 @@ script_name=$(basename $0)
|
||||
|
||||
source $(dirname $0)/../../scripts_common.sh
|
||||
|
||||
STDIN=`cat -`
|
||||
|
||||
error_message "$script_name: Operation not supported"
|
||||
|
||||
exit 1
|
||||
|
@ -39,6 +39,10 @@ source ${DRIVER_PATH}/../libfs.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -39,6 +39,10 @@ source ${DRIVER_PATH}/../libfs.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
export DRV_ACTION
|
||||
|
||||
UTILS_PATH="${DRIVER_PATH}/.."
|
||||
|
@ -15,6 +15,7 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "USED_MB=0"
|
||||
echo "TOTAL_MB=1"
|
||||
|
@ -16,5 +16,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
STDIN=`cat -`
|
||||
|
||||
exit 0
|
||||
|
||||
|
@ -16,5 +16,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "0"
|
||||
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "dummy_path"
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "dummy_path dummy_format"
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "dummy_path"
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "dummy_path"
|
||||
|
@ -15,6 +15,7 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "USED_MB=9720"
|
||||
echo "TOTAL_MB=20480"
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
exit 0
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
exit 0
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
exit 0
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
exit 0
|
||||
|
@ -15,5 +15,6 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "1024"
|
||||
|
@ -39,6 +39,10 @@ source ${DRIVER_PATH}/../libfs.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -40,6 +40,10 @@ source ${DRIVER_PATH}/../../etc/datastore/fs/fs.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
export DRV_ACTION
|
||||
|
||||
UTILS_PATH="${DRIVER_PATH}/.."
|
||||
|
@ -38,6 +38,10 @@ source ${DRIVER_PATH}/../libfs.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -40,6 +40,10 @@ source ${DRIVER_PATH}/../../etc/datastore/datastore.conf
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -38,6 +38,10 @@ source ${DRIVER_PATH}/../libfs.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -38,6 +38,10 @@ source ${DRIVER_PATH}/../libfs.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -39,6 +39,10 @@ source ${DRIVER_PATH}/../libfs.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i j XPATH_ELEMENTS
|
||||
|
@ -19,6 +19,10 @@
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
if [ -z "${ONE_LOCATION}" ]; then
|
||||
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||
else
|
||||
|
@ -19,6 +19,10 @@
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
if [ -z "${ONE_LOCATION}" ]; then
|
||||
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
|
||||
DATASTORES=/var/lib/one/datastores
|
||||
|
@ -59,6 +59,7 @@ require_relative '../../tm/lib/backup'
|
||||
require_relative '../../tm/lib/tm_action'
|
||||
|
||||
daction64 = ARGV[0]
|
||||
daction64 = STDIN.read if daction64 == '-'
|
||||
|
||||
# Parse input data.
|
||||
|
||||
|
@ -34,6 +34,10 @@ source ${DRIVER_PATH}/../libfs.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -69,7 +69,9 @@ require_relative '../../tm/lib/tm_action'
|
||||
# - vm.xml description
|
||||
# - list of disks in the backup
|
||||
# ------------------------------------------------------------------------------
|
||||
daction64 = ARGV[0]
|
||||
daction64 = ARGV[0]
|
||||
daction64 = STDIN.read if daction64 == '-'
|
||||
|
||||
_request_id = ARGV[1]
|
||||
|
||||
begin
|
||||
|
@ -59,6 +59,7 @@ require_relative '../../tm/lib/backup'
|
||||
require_relative '../../tm/lib/tm_action'
|
||||
|
||||
daction64 = ARGV[0]
|
||||
daction64 = STDIN.read if daction64 == '-'
|
||||
|
||||
# Parse input data.
|
||||
|
||||
|
@ -58,6 +58,8 @@ require 'base64'
|
||||
require_relative '../../tm/lib/tm_action'
|
||||
|
||||
daction64 = ARGV[0]
|
||||
daction64 = STDIN.read if daction64 == '-'
|
||||
|
||||
_ds_id = ARGV[1]
|
||||
|
||||
# Image path in the form:
|
||||
|
@ -53,6 +53,7 @@ require 'vcenter_driver'
|
||||
|
||||
drv_action_enc = ARGV[0]
|
||||
id = ARGV[1]
|
||||
drv_action_enc = STDIN.read if drv_action_enc == '-'
|
||||
|
||||
DRV_ACTION_DS = '/DS_DRIVER_ACTION_DATA/DATASTORE/'
|
||||
|
||||
|
@ -127,6 +127,7 @@ end
|
||||
|
||||
drv_action_enc = ARGV[0]
|
||||
id = ARGV[1]
|
||||
drv_action_enc = STDIN.read if drv_action_enc == '-'
|
||||
|
||||
drv_action = OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc),
|
||||
|
@ -56,6 +56,7 @@ $LOAD_PATH << File.dirname(__FILE__)
|
||||
require 'opennebula'
|
||||
|
||||
drv_action_enc = ARGV[0]
|
||||
drv_action_enc = STDIN.read if drv_action_enc == '-'
|
||||
|
||||
drv_action = OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc),
|
||||
|
@ -56,6 +56,7 @@ $LOAD_PATH << File.dirname(__FILE__)
|
||||
require 'vcenter_driver'
|
||||
|
||||
drv_action_enc = ARGV[0]
|
||||
drv_action_enc = STDIN.read if drv_action_enc == '-'
|
||||
|
||||
drv_action = OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc),
|
||||
|
@ -61,6 +61,7 @@ end
|
||||
|
||||
drv_action_enc = ARGV[0]
|
||||
id = ARGV[1]
|
||||
drv_action_enc = STDIN.read if drv_action_enc == '-'
|
||||
|
||||
drv_action = OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc),
|
||||
|
@ -60,6 +60,7 @@ def img_not_imported?(imported)
|
||||
end
|
||||
|
||||
drv_action_enc = ARGV[0]
|
||||
drv_action_enc = STDIN.read if drv_action_enc == '-'
|
||||
|
||||
drv_action =OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc),
|
||||
|
@ -56,6 +56,7 @@ $LOAD_PATH << File.dirname(__FILE__)
|
||||
require 'vcenter_driver'
|
||||
|
||||
drv_action_enc = ARGV[0]
|
||||
drv_action_enc = STDIN.read if drv_action_enc == '-'
|
||||
|
||||
drv_action =OpenNebula::XMLElement.new
|
||||
drv_action.initialize_xml(Base64.decode64(drv_action_enc),
|
||||
|
@ -40,6 +40,10 @@ source ${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh
|
||||
DRV_ACTION=$1
|
||||
ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i j XPATH_ELEMENTS
|
||||
|
@ -15,6 +15,7 @@
|
||||
# See the License for the specific language governing permissions and #
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
STDIN=`cat -`
|
||||
|
||||
echo "USED_MB=1429920"
|
||||
echo "FREE_MB=3333260"
|
||||
|
@ -38,6 +38,10 @@ source ${DRIVER_PATH}/../../datastore/libfs.sh
|
||||
DRV_ACTION=$1
|
||||
DS_ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -38,6 +38,10 @@ source ${DRIVER_PATH}/../../datastore/libfs.sh
|
||||
DRV_ACTION=$1
|
||||
DS_ID=$2
|
||||
|
||||
if [ "${DRV_ACTION}" = "-" ]; then
|
||||
DRV_ACTION=`cat -`
|
||||
fi
|
||||
|
||||
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb -b $DRV_ACTION"
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
@ -16,5 +16,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
STDIN=`cat -`
|
||||
|
||||
#The ssh system ds is monitored in each host using the monitor_ds.sh probe
|
||||
exit 0
|
||||
|
Loading…
Reference in New Issue
Block a user