x/vmware-nsx
Code Issues Proposed changes

Merge "Handle errors from run_ofctl() when dumping flows"

Browse Source
This commit is contained in:
Jenkins 2014-05-30 18:42:46 +00:00 committed by Gerrit Code Review
commit 1cb3ccd196
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/agent/linux/ovs_lib.py
View File

@ -204,10 +204,12 @@ class OVSBridge(BaseOVS):
self.run_ofctl("del-flows", [flow_expr_str]) self.run_ofctl("del-flows", [flow_expr_str])
def dump_flows_for_table(self, table): def dump_flows_for_table(self, table):
retval = None
flow_str = "table=%s" % table flow_str = "table=%s" % table
flows = self.run_ofctl("dump-flows", [flow_str]) flows = self.run_ofctl("dump-flows", [flow_str])
retval = '\n'.join(item for item in flows.splitlines() if flows:
if 'NXST' not in item) retval = '\n'.join(item for item in flows.splitlines()
if 'NXST' not in item)
return retval return retval
def defer_apply_on(self): def defer_apply_on(self):

28
neutron/tests/unit/agent/linux/test_ovs_lib.py
View File

@ -367,6 +367,34 @@ class OVS_Lib_Test(base.BaseTestCase):
self.br.delete_flows, self.br.delete_flows,
**params) **params)
def test_dump_flows(self):
table = 23
nxst_flow = "NXST_FLOW reply (xid=0x4):"
flows = "\n".join([" cookie=0x0, duration=18042.514s, table=0, "
"n_packets=6, n_bytes=468, "
"priority=2,in_port=1 actions=drop",
" cookie=0x0, duration=18027.562s, table=0, "
"n_packets=0, n_bytes=0, "
"priority=3,in_port=1,dl_vlan=100 "
"actions=mod_vlan_vid:1,NORMAL",
" cookie=0x0, duration=18044.351s, table=0, "
"n_packets=9, n_bytes=594, priority=1 "
"actions=NORMAL", " cookie=0x0, "
"duration=18044.211s, table=23, n_packets=0, "
"n_bytes=0, priority=0 actions=drop"])
flow_args = '\n'.join([nxst_flow, flows])
run_ofctl = mock.patch.object(self.br, 'run_ofctl').start()
run_ofctl.side_effect = [flow_args]
retflows = self.br.dump_flows_for_table(table)
self.assertEqual(flows, retflows)
def test_dump_flows_ovs_dead(self):
table = 23
run_ofctl = mock.patch.object(self.br, 'run_ofctl').start()
run_ofctl.side_effect = ['']
retflows = self.br.dump_flows_for_table(table)
self.assertEqual(None, retflows)
def test_mod_flow_with_priority_set(self): def test_mod_flow_with_priority_set(self):
params = {'in_port': '1', params = {'in_port': '1',
'priority': '1'} 'priority': '1'}