shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

B #3305: OpenvSwitch “del_flows” traceback (#3304)

Browse Source 
The “del_flows” override the loop variable “m” when matching the port,
on the second loop which result in the following error.

    /var/tmp/one/vnm/ovswitch/OpenvSwitch.rb:287:in `match': wrong
    argument type MatchData (expected Regexp) (TypeError)

* src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb: use a different variable
  name when matching the port than the loop iterator.

Signed-off-by: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
This commit is contained in:
Daniel 2019-05-09 09:25:51 +00:00 committed by Ruben S. Montero
parent c129976625
commit 2e13e8eb53
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb
View File

@ -284,12 +284,12 @@ class OpenvSwitchVLAN < VNMMAD::VNMDriver
# searching for flow just by MAC address is legacy,
# we preferably look for a flow port with our note
["note:#{port_note}", @nic[:mac]].each do |m|
["note:#{port_note}", @nic[:mac]].each do |flow_matching|
out_flows.lines do |flow|
next unless flow.match(m)
next unless flow.match(flow_matching)
if (m = flow.match(/in_port=(\d+)/))
in_port_tmp = m[1]
if (port_match = flow.match(/in_port=(\d+)/))
in_port_tmp = port_match[1]
if !the_ports.include?(in_port_tmp)
in_port = in_port_tmp