From 9624dd4b034c9a859583d4e1ddf5b8fe241c4864 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 22 Nov 2011 11:01:18 +0100 Subject: [PATCH] changes to vnm_driver --- src/mad/ruby/DriverExecHelper.rb | 6 +++--- src/vnm_mad/one_vnm.rb | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/mad/ruby/DriverExecHelper.rb b/src/mad/ruby/DriverExecHelper.rb index ff43bdbfcd..d857dec8ab 100644 --- a/src/mad/ruby/DriverExecHelper.rb +++ b/src/mad/ruby/DriverExecHelper.rb @@ -78,7 +78,7 @@ module DriverExecHelper end end - def get_info_from_execution(command_exe) + def get_info_from_execution(command_exe) if command_exe.code == 0 result = RESULT[:success] info = command_exe.stdout @@ -90,7 +90,7 @@ module DriverExecHelper info = "-" if info == nil || info.empty? [result, info] - end + end # Simple parser for the config file generated by OpenNebula def read_configuration @@ -126,4 +126,4 @@ module DriverExecHelper config end -end \ No newline at end of file +end diff --git a/src/vnm_mad/one_vnm.rb b/src/vnm_mad/one_vnm.rb index e07b8ef428..586f24c7eb 100644 --- a/src/vnm_mad/one_vnm.rb +++ b/src/vnm_mad/one_vnm.rb @@ -19,21 +19,21 @@ # OpenNebula Drivers class VirtualNetworkDriver - include DriverExecHelper + include DriverExecHelper - def initialize(directory, options={}) + def initialize(directory, options={}) - @options = options - @ssh_stream = options[:ssh_stream] + @options = options + @ssh_stream = options[:ssh_stream] + @message = options[:message] + @vm_encoded = Base64.encode64(@message.elements['VM'].to_s).delete("\n") - initialize_helper("vnet/#{directory}", options) - end + initialize_helper("vnet/#{directory}", options) + end - def do_action(parameters, aname) - vm_encoded = Base64.encode64(message.elements['VM'].to_s).delete("\n") - - command = action_command_line(aname, @vm_encoded, options[:script_name]) + def do_action(parameters, aname) + command = action_command_line(aname, @vm_encoded, options[:script_name]) if action_is_local? aname execution = LocalCommand.run(command, log_method(id)) @@ -42,5 +42,6 @@ class VirtualNetworkDriver end result, info = get_info_from_execution(command_exe) - end + end end +