B #6162: Only stdin supported for datastore driver

Deprecate the use of arguments for passing messages to the datastore
driver actions.

share/etc/oned.conf

@@ -662,7 +662,7 @@ TM_MAD = [
 
 DATASTORE_MAD = [
     EXECUTABLE = "one_datastore",
-    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"
+    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"
 ]
 
 #*******************************************************************************

src/datastore_mad/one_datastore.rb

@@ -93,7 +93,6 @@ def initialize(ds_type, sys_ds_type, options = {})
             :concurrency => 10,
             :threaded => true,
             :retries => 0,
-            :stdin   => false,
             :local_actions => {
                 ACTION[:stat]    => nil,
                 ACTION[:cp]      => nil,
@@ -236,15 +235,8 @@ def do_image_action(id, ds, action, stdin, sys = '', encode64 = false)
             path = File.join(@local_scripts_path, ds)
         end
 
-        if @options[:stdin]
-            arguments = " - #{id}"
-        else
-            arguments = " #{stdin} #{id}"
-            stdin = nil
-        end
-
         cmd  = File.join(path, ACTION[action].downcase)
-        cmd << arguments
+        cmd << " #{id}"
 
         rc = LocalCommand.run(cmd, log_method(id), stdin)
 
@@ -287,15 +279,13 @@ def get_ds_type(drv_message)
     ['--threads', '-t', GetoptLong::OPTIONAL_ARGUMENT],
     ['--ds-types', '-d', GetoptLong::OPTIONAL_ARGUMENT],
     ['--system-ds-types', '-s', GetoptLong::OPTIONAL_ARGUMENT],
-    ['--timeout', '-w', GetoptLong::OPTIONAL_ARGUMENT],
-    ['--stdin', '-i', GetoptLong::NO_ARGUMENT]
+    ['--timeout', '-w', GetoptLong::OPTIONAL_ARGUMENT]
 )
 
 ds_type     = nil
 sys_ds_type = nil
 threads     = 15
 timeout     = nil
-stdin       = false
 
 begin
     opts.each do |opt, arg|
@@ -308,8 +298,6 @@ def get_ds_type(drv_message)
             sys_ds_type = arg.split(',').map {|a| a.strip }
         when '--timeout'
             timeout = arg.to_i
-        when '--stdin'
-            stdin = true
         end
     end
 rescue StandardError => _e
@@ -318,6 +306,5 @@ def get_ds_type(drv_message)
 
 ds_driver = DatastoreDriver.new(ds_type, sys_ds_type,
                                 :concurrency => threads,
-                                :timeout     => timeout,
-                                :stdin       => stdin)
+                                :timeout     => timeout)
 ds_driver.start_driver

src/datastore_mad/remotes/ceph/clone

@@ -35,12 +35,8 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
 
 # -------- Get cp and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/ceph/cp

@@ -37,12 +37,8 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
 
 # -------- Get cp and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 export DRV_ACTION
 

src/datastore_mad/remotes/ceph/export

@@ -36,12 +36,8 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
 
 # -------- Get rm and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/ceph/mkfs

@@ -38,12 +38,8 @@ source ${DRIVER_PATH}/../../etc/datastore/datastore.conf
 
 # -------- Get mkfs and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/ceph/monitor

@@ -37,12 +37,8 @@ source ${DRIVER_PATH}/ceph_utils.sh
 
 # -------- Get datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/ceph/rm

@@ -37,12 +37,8 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
 
 # -------- Get rm and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/ceph/snap_delete

@@ -38,12 +38,8 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
 
 # -------- Get image and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/ceph/snap_flatten

@@ -38,12 +38,8 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
 
 # -------- Get image and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/ceph/snap_revert

@@ -38,12 +38,8 @@ source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
 
 # -------- Get image and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/common/stat

@@ -36,12 +36,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get stat and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/dev/cp

@@ -36,12 +36,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get cp and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 export DRV_ACTION
 

src/datastore_mad/remotes/fs/clone

@@ -36,12 +36,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get cp and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/fs/cp

@@ -37,12 +37,8 @@ source ${DRIVER_PATH}/../../etc/datastore/fs/fs.conf
 
 # -------- Get cp and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 export DRV_ACTION
 

src/datastore_mad/remotes/fs/export

@@ -35,12 +35,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get rm and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/fs/mkfs

@@ -37,12 +37,8 @@ source ${DRIVER_PATH}/../../etc/datastore/datastore.conf
 
 # -------- Get mkfs and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/fs/monitor

@@ -35,12 +35,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/fs/rm

@@ -35,12 +35,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get rm and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/fs/snap_delete

@@ -32,12 +32,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get image and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/fs/snap_flatten

@@ -28,12 +28,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get image and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/fs/snap_revert

@@ -32,12 +32,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get image and datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
 

src/datastore_mad/remotes/rsync/increment_flatten

@@ -58,8 +58,7 @@ require 'rexml/document'
 require_relative '../../tm/lib/backup'
 require_relative '../../tm/lib/tm_action'
 
-daction64 = ARGV[0]
-daction64 = STDIN.read if daction64 == '-'
+daction64 = STDIN.read
 
 # Parse input data.
 

src/datastore_mad/remotes/rsync/monitor

@@ -31,12 +31,8 @@ source ${DRIVER_PATH}/../libfs.sh
 
 # -------- Get datastore arguments from OpenNebula core ------------
 
-DRV_ACTION=$1
-ID=$2
-
-if [ "${DRV_ACTION}" = "-" ]; then
-    DRV_ACTION=`cat -`
-fi
+DRV_ACTION=`cat -`
+ID=$1
 
 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"