openstack/neutron
Code Issues Proposed changes

Merge "ovs_lib unable to parse return when port == -1"

Browse Source
This commit is contained in:
Jenkins 2012-09-04 05:34:01 +00:00 committed by Gerrit Code Review
commit d8160e02bb
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}))"'
iface = 'iface-id="(?P<vif_id>[^"]+)"'
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,? | . )* }'
' \s+ %(name)s \s+ %(port)s' % locals())
return re.compile(_re, re.M | re.X)