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

F #2851: get rid of unused :stdin in VirtualNetworkDriver

Browse Source
This commit is contained in:
Ruben S. Montero 2019-03-01 18:31:58 +01:00
parent 8121175b6e
commit a023d2ea3b
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vmm_mad/exec/one_vmm_exec.rb
View File

@ -223,10 +223,7 @@ class VmmAction
params = get_parameters(step[:parameters])
result, info = vnm.do_action(@id,
step[:action],
:stdin => true,
:parameters => params)
result, info = vnm.do_action(@id, step[:action], :parameters => params)
when :tm
result, info = @tm.do_transfer_action(@id, step[:parameters])

11
src/vnm_mad/one_vnm.rb
View File

@ -62,15 +62,10 @@ class VirtualNetworkDriver
cmd = action_command_line(aname, cmd_params, nil, subdirectory)
if action_is_local?(aname)
execution = LocalCommand.run(cmd, log_method(id))
execution = LocalCommand.run(cmd, log_method(id), "#{@vm_encoded}")
elsif @ssh_stream != nil
if options[:stdin]
cmdin = "cat << EOT | #{cmd}"
stdin = "#{@vm_encoded}\nEOT\n"
else
cmdin = cmd
stdin = nil
end
cmdin = "cat << EOT | #{cmd}"
stdin = "#{@vm_encoded}\nEOT\n"
execution = @ssh_stream.run(cmdin, stdin, cmd)
else