feature #863: bug fixes and cosmetic changes

src/mad/ruby/ssh_stream.rb

@@ -86,10 +86,14 @@ class SshStream
         code = -1
 
         while not (done_out and done_err)
-            rc, rw, = IO.select([@stdout, @stderr],[],[])
+            rc, rw, re= IO.select([@stdout, @stderr],[],[])
 
             rc.each { |fd|
-                c = fd.read_nonblock(80)
+                begin
+                    c = fd.read_nonblock(50)
+                rescue EOFError => e
+                    next
+                end
 
                 if !c
                     done = true
@@ -153,7 +157,7 @@ class SshStreamCommand < GenericCommand
 
         log(@stderr)
 
-        return @code
+        return self
     end
 end
 

src/vmm_mad/exec/one_vmm_exec.rb

@@ -33,6 +33,7 @@ $: << RUBY_LIB_LOCATION
 require "VirtualMachineDriver"
 require 'one_vnm'
 require 'getoptlong'
+require 'ssh_stream'
 
 require 'pp'
 

src/vnm_mad/one_vnm.rb

@@ -34,7 +34,7 @@ class VirtualNetworkDriver
 
         @vm_encoded = Base64.encode64(@message.elements['VM'].to_s).delete("\n")
 
-        initialize_helper("vnet/#{directory}", options)
+        initialize_helper("vnm/#{directory}", options)
     end
 
     # Calls remotes or local action checking the action name and
@@ -61,9 +61,9 @@ class VirtualNetworkDriver
                 stdin   = nil
             end
 
-            execution = @ssh_stream.run(command,stdin)
+            execution = @ssh_stream.run(command, stdin)
         end
 
         result, info = get_info_from_execution(execution)
     end
-end
+end