From a4e880d93252351639043ca1386355d1d942c8d9 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 2 Dec 2011 00:07:53 +0100 Subject: [PATCH] feature #863: Fixes use od scripts_common for exec_and_log --- src/vnm_mad/remotes/ebtables/Ebtables.rb | 4 ++-- src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vnm_mad/remotes/ebtables/Ebtables.rb b/src/vnm_mad/remotes/ebtables/Ebtables.rb index 860a56fb0a..c22ad69340 100644 --- a/src/vnm_mad/remotes/ebtables/Ebtables.rb +++ b/src/vnm_mad/remotes/ebtables/Ebtables.rb @@ -22,7 +22,7 @@ class EbtablesVLAN < OpenNebulaNetwork end def ebtables(rule) - exec_and_log("#{COMMANDS[:ebtables]} -A #{rule}") + OpenNebula.exec_and_log("#{COMMANDS[:ebtables]} -A #{rule}") end # Activates ebtables rules @@ -82,6 +82,6 @@ class EbtablesVLAN < OpenNebulaNetwork end def remove_rule(rule) - exec_and_log("#{COMMANDS[:ebtables]} -D FORWARD #{rule}") + OpenNebula.exec_and_log("#{COMMANDS[:ebtables]} -D FORWARD #{rule}") end end diff --git a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb index fdbf91c21e..9716d99f8a 100644 --- a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb +++ b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb @@ -32,7 +32,7 @@ class OpenvSwitchVLAN < OpenNebulaNetwork cmd = "#{COMMANDS[:ovs_vsctl]} set Port #{nic[:tap]} " cmd << "tag=#{vlan}" - exec_and_log(cmd) + OpenNebula.exec_and_log(cmd) end return 0