1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00

feature #3175: Fix bugs

This commit is contained in:
Ruben S. Montero 2014-12-22 23:39:56 +01:00
parent e3a71b17da
commit f85a67b0da
2 changed files with 3 additions and 4 deletions

View File

@ -62,7 +62,7 @@ module VNMNetwork
cmd_str = "#{cmd} #{args.join(' ')}"
end
super cmd_str
self << cmd_str
end
# Executes the commands array

View File

@ -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)