From a428b319de1c9df81e4621e185e11bdc2f185fc7 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 20 Sep 2012 12:50:56 +0200 Subject: [PATCH] bug #1423: now local vmm actions can use remote network script ssh_stream is always created but is lazily opened on the first command execution --- src/mad/ruby/ssh_stream.rb | 2 -- src/vmm_mad/exec/one_vmm_exec.rb | 12 +++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/mad/ruby/ssh_stream.rb b/src/mad/ruby/ssh_stream.rb index 2a2fba35a1..a72abdfb18 100644 --- a/src/mad/ruby/ssh_stream.rb +++ b/src/mad/ruby/ssh_stream.rb @@ -161,8 +161,6 @@ class SshStreamCommand < RemotesCommand @remote_dir = remote_dir @stream = SshStream.new(host, shell) - - @stream.open end def run(command, stdin=nil, base_cmd = nil) diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb index 0d5ac0d9bc..9dd1881578 100755 --- a/src/vmm_mad/exec/one_vmm_exec.rb +++ b/src/vmm_mad/exec/one_vmm_exec.rb @@ -257,15 +257,9 @@ class ExecDriver < VirtualMachineDriver # @param[String] id of the VM to log messages # @return [SshStreamCommand] def get_ssh_stream(aname, host, id) - stream = nil - - if not action_is_local?(aname) - stream = SshStreamCommand.new(host, - @remote_scripts_base_path, - log_method(id), nil, @shell) - else - return nil - end + SshStreamCommand.new(host, + @remote_scripts_base_path, + log_method(id), nil, @shell) end #---------------------------------------------------------------------------