From f85a67b0dac6894aba4dcd805ffe1d12b9da17bb Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Mon, 22 Dec 2014 23:39:56 +0100 Subject: [PATCH] feature #3175: Fix bugs --- src/vnm_mad/remotes/lib/command.rb | 2 +- src/vnm_mad/remotes/lib/one_sg.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vnm_mad/remotes/lib/command.rb b/src/vnm_mad/remotes/lib/command.rb index d1e65a3de7..aae4294984 100644 --- a/src/vnm_mad/remotes/lib/command.rb +++ b/src/vnm_mad/remotes/lib/command.rb @@ -62,7 +62,7 @@ module VNMNetwork cmd_str = "#{cmd} #{args.join(' ')}" end - super cmd_str + self << cmd_str end # Executes the commands array diff --git a/src/vnm_mad/remotes/lib/one_sg.rb b/src/vnm_mad/remotes/lib/one_sg.rb index ab698c6920..234d7c11d5 100644 --- a/src/vnm_mad/remotes/lib/one_sg.rb +++ b/src/vnm_mad/remotes/lib/one_sg.rb @@ -29,7 +29,7 @@ module VNMMAD def initialize(vm, deploy_id = nil, hypervisor = nil) super(vm, XPATH_FILTER, deploy_id, hypervisor) @locking = true - @commands = Commands.new + @commands = VNMMAD::VNMNetwork::Commands.new rules = {} @vm.vm_root.elements.each('TEMPLATE/SECURITY_GROUP_RULE') do |r| @@ -62,14 +62,13 @@ module VNMMAD && nic[:filter_mac_spoofing] != "YES" \ && nic[:filter_ip_spoofing] != "YES" - VNMMAD::SGIPTables.nic_pre(@vm, nic) sg_ids = nic[:security_groups].split(",") sg_ids.each do |sg_id| rules = @security_group_rules[sg_id] - + sg = VNMMAD::SGIPTables::SecurityGroupIPTables.new(@vm, nic, sg_id, rules)