x/vmware-nsx
Code Issues Proposed changes

ovs_lib unable to parse return when port == -1

Browse Source 
Fixes bug 1045536

Change-Id: I463dd31d67dff74caae1a0230df5d78c21beaf04
This commit is contained in:
Aaron Rosen 2012-09-03 15:00:48 -07:00
parent d03b79feaf
commit 22e4bdccf1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/agent/linux/ovs_lib.py
View File

@ -55,7 +55,7 @@ class OVSBridge:
mac = 'attached-mac="(?P<vif_mac>([a-fA-F\d]{2}:){5}([a-fA-F\d]{2}))"' mac = 'attached-mac="(?P<vif_mac>([a-fA-F\d]{2}:){5}([a-fA-F\d]{2}))"'
iface = 'iface-id="(?P<vif_id>[^"]+)"' iface = 'iface-id="(?P<vif_id>[^"]+)"'
name = 'name\s*:\s"(?P<port_name>[^"]*)"' name = 'name\s*:\s"(?P<port_name>[^"]*)"'
port = 'ofport\s*:\s(?P<ofport>\d+)' port = 'ofport\s*:\s(?P<ofport>-?\d+)'
_re = ('%(external)s:\s{ ( %(mac)s,? | %(iface)s,? | . )* }' _re = ('%(external)s:\s{ ( %(mac)s,? | %(iface)s,? | . )* }'
' \s+ %(name)s \s+ %(port)s' % locals()) ' \s+ %(name)s \s+ %(port)s' % locals())
return re.compile(_re, re.M | re.X) return re.compile(_re, re.M | re.X)