openstack
/
neutron
Code Issues Proposed changes

Merge "SimpleInterfaceMonitor handle case when ofport is an empty set"

This commit is contained in:
Jenkins 2015-09-01 06:50:54 +00:00 committed by Gerrit Code Review
parent 2e908def81 cbeee7da50
commit 3cdd2f3afd
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/ovsdb_monitor.py
View File

@ -104,6 +104,8 @@ class SimpleInterfaceMonitor(OvsdbMonitor):
for ovs_id, action, name, ofport, external_ids in json:
if external_ids:
external_ids = ovsdb.val_to_py(external_ids)
if ofport:
ofport = ovsdb.val_to_py(ofport)
device = {'name': name,
'ofport': ofport,
'external_ids': external_ids}

11
neutron/tests/unit/agent/linux/test_ovsdb_monitor.py
View File

@ -14,6 +14,7 @@
import mock
from neutron.agent.common import ovs_lib
from neutron.agent.linux import ovsdb_monitor
from neutron.tests import base
@ -93,3 +94,13 @@ class TestSimpleInterfaceMonitor(base.BaseTestCase):
self.monitor.get_events()
self.assertTrue(process_events.called)
self.assertFalse(self.monitor.has_updates)
def process_event_unassigned_of_port(self):
output = '{"data":[["e040fbec-0579-4990-8324-d338da33ae88","insert",'
output += '"m50",["set",[]],["map",[]]]],"headings":["row","action",'
output += '"name","ofport","external_ids"]}'
with mock.patch.object(
self.monitor, 'iter_stdout', return_value=[output]):
self.monitor.process_events()
self.assertEqual(self.monitor.new_events['added'][0]['ofport'],
ovs_lib.UNASSIGNED_OFPORT)